Henri Verbeet : wined3d: Recognize the SM4 utof opcode.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ff9c2fcdb2bc03976b7cdd6e111917cc23388607
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ff9c2fcdb2bc03976b7cdd6e11...

Author: Henri Verbeet 
Date:   Mon Oct 11 13:06:19 2010 +0200

wined3d: Recognize the SM4 utof opcode.

---

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 e4eb02a..c609291 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5025,6 +5025,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_UTOF          */ NULL,
 };

static inline BOOL get_bool_const(const struct wined3d_shader_instruction *ins, IWineD3DBaseShaderImpl *This, DWORD idx)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index fd0b853..3390848 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -5083,6 +5083,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_UTOF          */ NULL,
 };

static void shader_glsl_handle_instruction(const struct wined3d_shader_instruction *ins) {
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index b7f9a91..f6546c8 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -129,6 +129,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_TEXREG2AR     */ "texreg2ar",
     /* WINED3DSIH_TEXREG2GB     */ "texreg2gb",
     /* WINED3DSIH_TEXREG2RGB    */ "texreg2rgb",
+    /* WINED3DSIH_UTOF          */ "utof",
 };

static const char * const semantic_names[] =
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 9a02830..1b4dbd5 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -79,6 +79,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_SAMPLE       = 0x45,
     WINED3D_SM4_OP_SAMPLE_LOD   = 0x48,
     WINED3D_SM4_OP_SINCOS       = 0x4d,
+    WINED3D_SM4_OP_UTOF         = 0x56,
 };

enum wined3d_sm4_register_type
@@ -152,6 +153,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM4_OP_SAMPLE,     WINED3DSIH_SAMPLE,      1,  3},
     {WINED3D_SM4_OP_SAMPLE_LOD, WINED3DSIH_SAMPLE_LOD,  1,  4},
     {WINED3D_SM4_OP_SINCOS,     WINED3DSIH_SINCOS,      2,  1},
+    {WINED3D_SM4_OP_UTOF,       WINED3DSIH_UTOF,        1,  1},
 };

static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] =
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 3e2596e..b291d43 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -497,6 +497,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_TEXREG2AR,
     WINED3DSIH_TEXREG2GB,
     WINED3DSIH_TEXREG2RGB,
+    WINED3DSIH_UTOF,
     WINED3DSIH_TABLE_SIZE
 };