=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Recognize SM5 deriv_rtx_coarse opcode.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Mar 17 10:02:14 CDT 2016


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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Thu Mar 17 11:47:11 2016 +0100

wined3d: Recognize SM5 deriv_rtx_coarse opcode.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 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 00d876e..4885065 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5252,6 +5252,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_DP4                           */ shader_hw_map2gl,
     /* WINED3DSIH_DST                           */ shader_hw_map2gl,
     /* WINED3DSIH_DSX                           */ shader_hw_map2gl,
+    /* WINED3DSIH_DSX_COARSE                    */ NULL,
     /* WINED3DSIH_DSY                           */ shader_hw_dsy,
     /* WINED3DSIH_ELSE                          */ shader_hw_else,
     /* WINED3DSIH_EMIT                          */ NULL,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 0ef15ae..c915470 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8094,6 +8094,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_DP4                           */ shader_glsl_dot,
     /* WINED3DSIH_DST                           */ shader_glsl_dst,
     /* WINED3DSIH_DSX                           */ shader_glsl_map2gl,
+    /* WINED3DSIH_DSX_COARSE                    */ NULL,
     /* WINED3DSIH_DSY                           */ shader_glsl_map2gl,
     /* WINED3DSIH_ELSE                          */ shader_glsl_else,
     /* WINED3DSIH_EMIT                          */ shader_glsl_emit,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 5e8df04..c946640 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -80,6 +80,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_DP4                           */ "dp4",
     /* WINED3DSIH_DST                           */ "dst",
     /* WINED3DSIH_DSX                           */ "dsx",
+    /* WINED3DSIH_DSX_COARSE                    */ "deriv_rtx_coarse",
     /* WINED3DSIH_DSY                           */ "dsy",
     /* WINED3DSIH_ELSE                          */ "else",
     /* WINED3DSIH_EMIT                          */ "emit",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 5757aca..aaacd44 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -183,6 +183,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_DCL_OUTPUT_SIV       = 0x67,
     WINED3D_SM4_OP_DCL_TEMPS            = 0x68,
     WINED3D_SM4_OP_DCL_GLOBAL_FLAGS     = 0x6a,
+    WINED3D_SM5_OP_DERIV_RTX_COARSE     = 0x7a,
     WINED3D_SM5_OP_LD_STRUCTURED        = 0xa7,
 };
 
@@ -385,6 +386,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
     {WINED3D_SM4_OP_DCL_OUTPUT_SIV,         WINED3DSIH_DCL_OUTPUT_SIV,                "",     ""},
     {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_LD_STRUCTURED,          WINED3DSIH_LD_STRUCTURED,                 "U",    "UUR"},
 };
 
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index d474bee..cb69b6b 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -532,6 +532,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_DP4,
     WINED3DSIH_DST,
     WINED3DSIH_DSX,
+    WINED3DSIH_DSX_COARSE,
     WINED3DSIH_DSY,
     WINED3DSIH_ELSE,
     WINED3DSIH_EMIT,




More information about the wine-cvs mailing list