[PATCH 1/6] wined3d: Recognize SM5 ibfe opcode.
Józef Kucia
jkucia at codeweavers.com
Tue Apr 4 05:35:53 CDT 2017
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 8d187ac..4452e18 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5131,6 +5131,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_HS_FORK_PHASE */ NULL,
/* WINED3DSIH_HS_JOIN_PHASE */ NULL,
/* WINED3DSIH_IADD */ NULL,
+ /* WINED3DSIH_IBFE */ NULL,
/* WINED3DSIH_IEQ */ NULL,
/* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */,
/* WINED3DSIH_IFC */ shader_hw_ifc,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 20a2208..d36d99c 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -9963,6 +9963,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_HS_FORK_PHASE */ NULL,
/* WINED3DSIH_HS_JOIN_PHASE */ NULL,
/* WINED3DSIH_IADD */ shader_glsl_binop,
+ /* WINED3DSIH_IBFE */ NULL,
/* WINED3DSIH_IEQ */ shader_glsl_relop,
/* WINED3DSIH_IF */ shader_glsl_if,
/* WINED3DSIH_IFC */ shader_glsl_ifc,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index ab8d85c..e96c15f 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -151,6 +151,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_HS_FORK_PHASE */ "hs_fork_phase",
/* WINED3DSIH_HS_JOIN_PHASE */ "hs_join_phase",
/* WINED3DSIH_IADD */ "iadd",
+ /* WINED3DSIH_IBFE */ "ibfe",
/* WINED3DSIH_IEQ */ "ieq",
/* WINED3DSIH_IF */ "if",
/* WINED3DSIH_IFC */ "ifc",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 770ef18..3e8b1f2 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -240,6 +240,7 @@ enum wined3d_sm4_opcode
WINED3D_SM5_OP_FIRSTBIT_LO = 0x88,
WINED3D_SM5_OP_FIRSTBIT_SHI = 0x89,
WINED3D_SM5_OP_UBFE = 0x8a,
+ WINED3D_SM5_OP_IBFE = 0x8b,
WINED3D_SM5_OP_BFI = 0x8c,
WINED3D_SM5_OP_BFREV = 0x8d,
WINED3D_SM5_OP_SWAPC = 0x8e,
@@ -974,6 +975,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM5_OP_FIRSTBIT_LO, WINED3DSIH_FIRSTBIT_LO, "u", "u"},
{WINED3D_SM5_OP_FIRSTBIT_SHI, WINED3DSIH_FIRSTBIT_SHI, "u", "i"},
{WINED3D_SM5_OP_UBFE, WINED3DSIH_UBFE, "u", "iiu"},
+ {WINED3D_SM5_OP_IBFE, WINED3DSIH_IBFE, "i", "iii"},
{WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "iiuu"},
{WINED3D_SM5_OP_BFREV, WINED3DSIH_BFREV, "u", "u"},
{WINED3D_SM5_OP_SWAPC, WINED3DSIH_SWAPC, "ff", "uff"},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 9a388ac..0ef1e8c 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -767,6 +767,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_HS_FORK_PHASE,
WINED3DSIH_HS_JOIN_PHASE,
WINED3DSIH_IADD,
+ WINED3DSIH_IBFE,
WINED3DSIH_IEQ,
WINED3DSIH_IF,
WINED3DSIH_IFC,
--
2.10.2
More information about the wine-patches
mailing list