commit 8d4c90496f8ff981f75ef473ca2ae11bfbe0ffca
author Henri Verbeet <hverbeet@codeweavers.com> Wed Apr 29 09:55:06 2009 +0200
committer Alexandre Julliard <julliard@winehq.org> Wed Apr 29 13:08:01 2009 +0200
tree 4bf8405122419a109f0ed3f845103ba104c080ee
parent 54d7c8012d1d7369a56779955ced5a09e448a1cd

wined3d: Store the sampler type in struct shader_reg_maps.

Instead of the usage token.

dlls/wined3d/wined3d_private.h

diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 5809cb9..b6d5152 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -416,9 +416,7 @@
     WORD integer_constants;                 /* MAX_CONST_I, 16 */
     WORD boolean_constants;                 /* MAX_CONST_B, 16 */
 
-    /* Sampler usage tokens
-     * Use 0 as default (bit 31 is always 1 on a valid token) */
-    DWORD samplers[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)];
+    WINED3DSAMPLER_TEXTURE_TYPE sampler_type[max(MAX_FRAGMENT_SAMPLERS, MAX_VERTEX_SAMPLERS)];
     BOOL bumpmat[MAX_TEXTURES], luminanceparams[MAX_TEXTURES];
     char usesnrm, vpos, usesdsy;
     char usesrelconstF;