[PATCH 5/8] wined3d: Recognize SM4.1 lod opcode.

Józef Kucia jkucia at codeweavers.com
Fri Jul 15 04:16:20 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 179785d..21ee49e 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5320,6 +5320,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
     /* WINED3DSIH_LD_STRUCTURED                    */ NULL,
     /* WINED3DSIH_LD_UAV_TYPED                     */ NULL,
     /* WINED3DSIH_LIT                              */ shader_hw_map2gl,
+    /* WINED3DSIH_LOD                              */ NULL,
     /* WINED3DSIH_LOG                              */ shader_hw_scalar_op,
     /* WINED3DSIH_LOGP                             */ shader_hw_scalar_op,
     /* WINED3DSIH_LOOP                             */ shader_hw_loop,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 3a6af83..9cc3117 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -8738,6 +8738,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
     /* WINED3DSIH_LD_STRUCTURED                    */ NULL,
     /* WINED3DSIH_LD_UAV_TYPED                     */ NULL,
     /* WINED3DSIH_LIT                              */ shader_glsl_lit,
+    /* WINED3DSIH_LOD                              */ NULL,
     /* WINED3DSIH_LOG                              */ shader_glsl_scalar_op,
     /* WINED3DSIH_LOGP                             */ shader_glsl_scalar_op,
     /* WINED3DSIH_LOOP                             */ shader_glsl_loop,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 01482ad..914970e 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -150,6 +150,7 @@ static const char * const shader_opcode_names[] =
     /* WINED3DSIH_LD_STRUCTURED                    */ "ld_structured",
     /* WINED3DSIH_LD_UAV_TYPED                     */ "ld_uav_typed",
     /* WINED3DSIH_LIT                              */ "lit",
+    /* WINED3DSIH_LOD                              */ "lod",
     /* WINED3DSIH_LOG                              */ "log",
     /* WINED3DSIH_LOGP                             */ "logp",
     /* WINED3DSIH_LOOP                             */ "loop",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index b7e9935..a000bb6 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -203,6 +203,7 @@ enum wined3d_sm4_opcode
     WINED3D_SM4_OP_DCL_TEMPS                        = 0x68,
     WINED3D_SM4_OP_DCL_INDEXABLE_TEMP               = 0x69,
     WINED3D_SM4_OP_DCL_GLOBAL_FLAGS                 = 0x6a,
+    WINED3D_SM4_OP_LOD                              = 0x6c,
     WINED3D_SM4_OP_GATHER4                          = 0x6d,
     WINED3D_SM5_OP_HS_DECLS                         = 0x71,
     WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE           = 0x72,
@@ -801,6 +802,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
             shader_sm4_read_dcl_indexable_temp},
     {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS,                 WINED3DSIH_DCL_GLOBAL_FLAGS,                 "",     "",
             shader_sm4_read_dcl_global_flags},
+    {WINED3D_SM4_OP_LOD,                              WINED3DSIH_LOD,                              "f",    "fRS"},
     {WINED3D_SM4_OP_GATHER4,                          WINED3DSIH_GATHER4,                          "u",    "fRS"},
     {WINED3D_SM5_OP_HS_DECLS,                         WINED3DSIH_HS_DECLS,                         "",     ""},
     {WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE,           WINED3DSIH_HS_CONTROL_POINT_PHASE,           "",     ""},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 7e94193..904eb86 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -666,6 +666,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
     WINED3DSIH_LD_STRUCTURED,
     WINED3DSIH_LD_UAV_TYPED,
     WINED3DSIH_LIT,
+    WINED3DSIH_LOD,
     WINED3DSIH_LOG,
     WINED3DSIH_LOGP,
     WINED3DSIH_LOOP,
-- 
2.7.3




More information about the wine-patches mailing list