[PATCH 4/6] wined3d: Recognize SM5 deriv_rtx_fine opcode.

Józef Kucia jkucia at codeweavers.com
Thu Mar 17 05:47:13 CDT 2016


Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
 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 923c7bd..f14caaa 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5253,6 +5253,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_DST                           */ shader_hw_map2gl,
     /* WINED3DSIH_DSX                           */ shader_hw_map2gl,
     /* WINED3DSIH_DSX_COARSE                    */ NULL,
+    /* WINED3DSIH_DSX_FINE                      */ NULL,
     /* WINED3DSIH_DSY                           */ shader_hw_dsy,
     /* WINED3DSIH_DSY_COARSE                    */ NULL,
     /* WINED3DSIH_ELSE                          */ shader_hw_else,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index c6c7e50..e0a6a23 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8116,6 +8116,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_DST                           */ shader_glsl_dst,
     /* WINED3DSIH_DSX                           */ shader_glsl_map2gl,
     /* WINED3DSIH_DSX_COARSE                    */ NULL,
+    /* WINED3DSIH_DSX_FINE                      */ NULL,
     /* WINED3DSIH_DSY                           */ shader_glsl_map2gl,
     /* WINED3DSIH_DSY_COARSE                    */ NULL,
     /* WINED3DSIH_ELSE                          */ shader_glsl_else,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 5ef39ff..eb57171 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -81,6 +81,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_DST                           */ "dst",
     /* WINED3DSIH_DSX                           */ "dsx",
     /* WINED3DSIH_DSX_COARSE                    */ "deriv_rtx_coarse",
+    /* WINED3DSIH_DSX_FINE                      */ "deriv_rtx_fine",
     /* WINED3DSIH_DSY                           */ "dsy",
     /* WINED3DSIH_DSY_COARSE                    */ "deriv_rty_coarse",
     /* WINED3DSIH_ELSE                          */ "else",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 65bcfa4..5f12c55 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -184,6 +184,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_DCL_TEMPS            = 0x68,
     WINED3D_SM4_OP_DCL_GLOBAL_FLAGS     = 0x6a,
     WINED3D_SM5_OP_DERIV_RTX_COARSE     = 0x7a,
+    WINED3D_SM5_OP_DERIV_RTX_FINE       = 0x7b,
     WINED3D_SM5_OP_DERIV_RTY_COARSE     = 0x7c,
     WINED3D_SM5_OP_LD_STRUCTURED        = 0xa7,
 };
@@ -388,6 +389,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM4_OP_DCL_TEMPS,              WINED3DSIH_DCL_TEMPS,                     "",     ""},
     {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS,       WINED3DSIH_DCL_GLOBAL_FLAGS,              "",     ""},
     {WINED3D_SM5_OP_DERIV_RTX_COARSE,       WINED3DSIH_DSX_COARSE,                    "F",    "F"},
+    {WINED3D_SM5_OP_DERIV_RTX_FINE,         WINED3DSIH_DSX_FINE,                      "F",    "F"},
     {WINED3D_SM5_OP_DERIV_RTY_COARSE,       WINED3DSIH_DSY_COARSE,                    "F",    "F"},
     {WINED3D_SM5_OP_LD_STRUCTURED,          WINED3DSIH_LD_STRUCTURED,                 "U",    "UUR"},
 };
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 3cfb480..30254ab 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -533,6 +533,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_DST,
     WINED3DSIH_DSX,
     WINED3DSIH_DSX_COARSE,
+    WINED3DSIH_DSX_FINE,
     WINED3DSIH_DSY,
     WINED3DSIH_DSY_COARSE,
     WINED3DSIH_ELSE,
-- 
2.4.10




More information about the wine-patches mailing list