From d695dd3af4502a1e91284b606b97e157f0c75321 Mon Sep 17 00:00:00 2001
From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Mon, 21 Nov 2011 18:48:38 +0100
Subject: [PATCH] wined3d: Recognize the SM4 ushr 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(+)

diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 57397330e6a..03b525f53c7 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5128,6 +5128,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_TEXREG2GB     */ pshader_hw_texreg2gb,
     /* WINED3DSIH_TEXREG2RGB    */ pshader_hw_texreg2rgb,
     /* WINED3DSIH_UDIV          */ NULL,
+    /* WINED3DSIH_USHR          */ NULL,
     /* WINED3DSIH_UTOF          */ NULL,
 };
 
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 8e1724c412d..b1c9b610b65 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_TEXREG2GB     */ shader_glsl_texreg2gb,
     /* WINED3DSIH_TEXREG2RGB    */ shader_glsl_texreg2rgb,
     /* WINED3DSIH_UDIV          */ NULL,
+    /* WINED3DSIH_USHR          */ NULL,
     /* WINED3DSIH_UTOF          */ NULL,
 };
 
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 998b431036a..5f2448cd8c8 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -139,6 +139,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_TEXREG2GB     */ "texreg2gb",
     /* WINED3DSIH_TEXREG2RGB    */ "texreg2rgb",
     /* WINED3DSIH_UDIV          */ "udiv",
+    /* WINED3DSIH_USHR          */ "ushr",
     /* WINED3DSIH_UTOF          */ "utof",
 };
 
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index b78f03bc1bb..5c675c278a2 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -95,6 +95,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_SQRT         = 0x4b,
     WINED3D_SM4_OP_SINCOS       = 0x4d,
     WINED3D_SM4_OP_UDIV         = 0x4e,
+    WINED3D_SM4_OP_USHR         = 0x55,
     WINED3D_SM4_OP_UTOF         = 0x56,
 };
 
@@ -182,6 +183,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {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_USHR,       WINED3DSIH_USHR,        1,  2},
     {WINED3D_SM4_OP_UTOF,       WINED3DSIH_UTOF,        1,  1},
 };
 
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 7e773471086..72ffe739291 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -512,6 +512,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_TEXREG2GB,
     WINED3DSIH_TEXREG2RGB,
     WINED3DSIH_UDIV,
+    WINED3DSIH_USHR,
     WINED3DSIH_UTOF,
     WINED3DSIH_TABLE_SIZE
 };