[PATCH 1/5] wined3d: Recognize the SM4 udiv opcode.

Henri Verbeet hverbeet at codeweavers.com
Mon Nov 21 11:48:37 CST 2011


---
 dlls/wined3d/arb_program_shader.c |    1 +
 dlls/wined3d/glsl_shader.c        |    1 +
 dlls/wined3d/shader.c             |    1 +
 dlls/wined3d/shader_sm4.c         |    2 ++
 dlls/wined3d/wined3d_private.h    |    1 +
 5 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 32197d5..5739733 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5127,6 +5127,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_TEXREG2AR     */ pshader_hw_texreg2ar,
     /* WINED3DSIH_TEXREG2GB     */ pshader_hw_texreg2gb,
     /* WINED3DSIH_TEXREG2RGB    */ pshader_hw_texreg2rgb,
+    /* WINED3DSIH_UDIV          */ NULL,
     /* WINED3DSIH_UTOF          */ NULL,
 };
 
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 9d88794..8e1724c 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -5082,6 +5082,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_TEXREG2AR     */ shader_glsl_texreg2ar,
     /* WINED3DSIH_TEXREG2GB     */ shader_glsl_texreg2gb,
     /* WINED3DSIH_TEXREG2RGB    */ shader_glsl_texreg2rgb,
+    /* WINED3DSIH_UDIV          */ NULL,
     /* WINED3DSIH_UTOF          */ NULL,
 };
 
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index e182435..998b431 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -138,6 +138,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_TEXREG2AR     */ "texreg2ar",
     /* WINED3DSIH_TEXREG2GB     */ "texreg2gb",
     /* WINED3DSIH_TEXREG2RGB    */ "texreg2rgb",
+    /* WINED3DSIH_UDIV          */ "udiv",
     /* WINED3DSIH_UTOF          */ "utof",
 };
 
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 973d606..b78f03b 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -94,6 +94,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_SAMPLE_GRAD  = 0x49,
     WINED3D_SM4_OP_SQRT         = 0x4b,
     WINED3D_SM4_OP_SINCOS       = 0x4d,
+    WINED3D_SM4_OP_UDIV         = 0x4e,
     WINED3D_SM4_OP_UTOF         = 0x56,
 };
 
@@ -180,6 +181,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM4_OP_SAMPLE_GRAD,WINED3DSIH_SAMPLE_GRAD, 1,  5},
     {WINED3D_SM4_OP_SQRT,       WINED3DSIH_SQRT,        1,  1},
     {WINED3D_SM4_OP_SINCOS,     WINED3DSIH_SINCOS,      2,  1},
+    {WINED3D_SM4_OP_UDIV,       WINED3DSIH_UDIV,        2,  2},
     {WINED3D_SM4_OP_UTOF,       WINED3DSIH_UTOF,        1,  1},
 };
 
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 7a22faf..7e77347 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -511,6 +511,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_TEXREG2AR,
     WINED3DSIH_TEXREG2GB,
     WINED3DSIH_TEXREG2RGB,
+    WINED3DSIH_UDIV,
     WINED3DSIH_UTOF,
     WINED3DSIH_TABLE_SIZE
 };
-- 
1.7.3.4




More information about the wine-patches mailing list