diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index d53f2c8ffdc..d8b9f9f88af 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
@@ -74,7 +74,7 @@ const SHADER_OPCODE* shader_get_opcode(
 
     /** TODO: use dichotomic search */
     while (NULL != shader_ins[i].name) {
-        if (((code & D3DSI_OPCODE_MASK) == shader_ins[i].opcode) &&
+        if (((code & WINED3DSI_OPCODE_MASK) == shader_ins[i].opcode) &&
             (((hex_version >= shader_ins[i].min_version) && (hex_version <= shader_ins[i].max_version)) ||
             ((shader_ins[i].min_version == 0) && (shader_ins[i].max_version == 0)))) {
             return &shader_ins[i];
@@ -82,7 +82,7 @@ const SHADER_OPCODE* shader_get_opcode(
         ++i;
     }
     FIXME("Unsupported opcode %#x(%d) masked %#x, shader version %#x\n", 
-       code, code, code & D3DSI_OPCODE_MASK, hex_version);
+       code, code, code & WINED3DSI_OPCODE_MASK, hex_version);
     return NULL;
 }
 
@@ -119,7 +119,7 @@ static inline int shader_skip_opcode(
     * have a useful legnth mask - use it here. Shaders 1.0 contain no such tokens */
 
     return (D3DSHADER_VERSION_MAJOR(This->baseShader.hex_version) >= 2)?
-        ((opcode_token & D3DSI_INSTLENGTH_MASK) >> D3DSI_INSTLENGTH_SHIFT):
+        ((opcode_token & WINED3DSI_INSTLENGTH_MASK) >> WINED3DSI_INSTLENGTH_SHIFT):
         curOpcode->num_params;
 }
 
@@ -202,7 +202,7 @@ HRESULT shader_get_registers_used(
 
         /* Skip comments */
         } else if (shader_is_comment(*pToken)) {
-             DWORD comment_len = (*pToken & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT;
+             DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT;
              ++pToken;
              pToken += comment_len;
              continue;
@@ -354,7 +354,7 @@ HRESULT shader_get_registers_used(
              * okay, since we'll catch any address registers when 
              * they are initialized (required by spec) */
 
-            limit = (opcode_token & D3DSHADER_INSTRUCTION_PREDICATED)?
+            limit = (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED)?
                 curOpcode->num_params + 1: curOpcode->num_params;
 
             for (i = 0; i < limit; ++i) {
@@ -699,7 +699,7 @@ void shader_generate_main(
 
             /* Skip comment tokens */
             if (shader_is_comment(*pToken)) {
-                DWORD comment_len = (*pToken & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT;
+                DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT;
                 ++pToken;
                 TRACE("#%s\n", (char*)pToken);
                 pToken += comment_len;
@@ -749,7 +749,7 @@ void shader_generate_main(
                 }
 
                 /* Predication token */
-                if (hw_arg.opcode_token & D3DSHADER_INSTRUCTION_PREDICATED) 
+                if (hw_arg.opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) 
                     hw_arg.predicate = *pToken++;
 
                 /* Other source tokens */
@@ -832,7 +832,7 @@ void shader_trace_init(
                 continue;
             }
             if (shader_is_comment(*pToken)) { /** comment */
-                DWORD comment_len = (*pToken & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT;
+                DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT;
                 ++pToken;
                 TRACE("//%s\n", (char*)pToken);
                 pToken += comment_len;
@@ -901,7 +901,7 @@ void shader_trace_init(
 
                     /* Print out predication source token first - it follows
                      * the destination token. */
-                    if (opcode_token & D3DSHADER_INSTRUCTION_PREDICATED) {
+                    if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) {
                         TRACE("(");
                         shader_dump_param(iface, *(pToken + 2), 0, 1);
                         TRACE(") ");
@@ -939,7 +939,7 @@ void shader_trace_init(
                     }
 
                     /* Predication token - already printed out, just skip it */
-                    if (opcode_token & D3DSHADER_INSTRUCTION_PREDICATED) {
+                    if (opcode_token & WINED3DSHADER_INSTRUCTION_PREDICATED) {
                         pToken++;
                         len++;
                     }
diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c
index 07429b656af..9e481072c2b 100644
--- a/dlls/wined3d/vertexshader.c
+++ b/dlls/wined3d/vertexshader.c
@@ -895,7 +895,7 @@ HRESULT WINAPI IWineD3DVertexShaderImpl_ExecuteSW(IWineD3DVertexShader* iface, W
     }
     while (D3DVS_END() != *pToken) {
         if (shader_is_comment(*pToken)) { /** comment */
-            DWORD comment_len = (*pToken & D3DSI_COMMENTSIZE_MASK) >> D3DSI_COMMENTSIZE_SHIFT;
+            DWORD comment_len = (*pToken & WINED3DSI_COMMENTSIZE_MASK) >> WINED3DSI_COMMENTSIZE_SHIFT;
             ++pToken;
             pToken += comment_len;
             continue ;
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index c3512f2ed3b..60a934ac62e 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -1683,7 +1683,7 @@ inline static BOOL shader_is_vshader_version(DWORD token) {
 }
 
 inline static BOOL shader_is_comment(DWORD token) {
-    return WINED3DSIO_COMMENT == (token & D3DSI_OPCODE_MASK);
+    return WINED3DSIO_COMMENT == (token & WINED3DSI_OPCODE_MASK);
 }
 
 /* Internally used shader constants. Applications can use constants 0 to GL_LIMITS(vshader_constantsF) - 1,
diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h
index c075c709e12..e022922dde5 100644
--- a/dlls/wined3d/wined3d_private_types.h
+++ b/dlls/wined3d/wined3d_private_types.h
@@ -249,4 +249,19 @@ typedef enum _WINED3DSHADER_INSTRUCTION_OPCODE_TYPE {
   WINED3DSIO_FORCE_DWORD  = 0X7FFFFFFF /** for 32-bit alignment */
 } WINED3DSHADER_INSTRUCTION_OPCODE_TYPE;
 
+/** opcode-related masks **/
+
+#define WINED3DSI_OPCODE_MASK       0x0000FFFF
+#define WINED3DSI_INSTLENGTH_MASK   0x0F000000
+#define WINED3DSI_INSTLENGTH_SHIFT  24
+
+#define WINED3DSI_COISSUE 0x40000000
+
+#define WINED3DSI_COMMENTSIZE_SHIFT 16
+#define WINED3DSI_COMMENTSIZE_MASK (0x7FFF << WINED3DSI_COMMENTSIZE_SHIFT)
+#define WINED3DSHADER_COMMENT(commentSize) \
+  ((((commentSize) << WINED3DSI_COMMENTSIZE_SHIFT) & WINED3DSI_COMMENTSIZE_MASK) | WINED3DSIO_COMMENT)
+
+#define WINED3DSHADER_INSTRUCTION_PREDICATED (1 << 28)
+  
 #endif