[PATCH 5/7] wined3d: Recognize SM4 ineg opcode.
Józef Kucia
jkucia at codeweavers.com
Mon Jan 11 04:53:24 CST 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 ac7964e..074b74f 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5264,6 +5264,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_IMIN */ NULL,
/* WINED3DSIH_IMUL */ NULL,
/* WINED3DSIH_INE */ NULL,
+ /* WINED3DSIH_INEG */ NULL,
/* WINED3DSIH_ISHL */ NULL,
/* WINED3DSIH_ITOF */ NULL,
/* WINED3DSIH_LABEL */ shader_hw_label,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index f11acc4..27c079b 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -7912,6 +7912,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_IMIN */ shader_glsl_map2gl,
/* WINED3DSIH_IMUL */ shader_glsl_imul,
/* WINED3DSIH_INE */ NULL,
+ /* WINED3DSIH_INEG */ NULL,
/* WINED3DSIH_ISHL */ shader_glsl_binop,
/* WINED3DSIH_ITOF */ shader_glsl_to_float,
/* WINED3DSIH_LABEL */ shader_glsl_label,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 3ddaa0f..d747816 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -92,6 +92,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_IMIN */ "imin",
/* WINED3DSIH_IMUL */ "imul",
/* WINED3DSIH_INE */ "ine",
+ /* WINED3DSIH_INEG */ "ineg",
/* WINED3DSIH_ISHL */ "ishl",
/* WINED3DSIH_ITOF */ "itof",
/* WINED3DSIH_LABEL */ "label",
diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c
index 4636c5f..6e02352 100644
--- a/dlls/wined3d/shader_sm4.c
+++ b/dlls/wined3d/shader_sm4.c
@@ -105,6 +105,7 @@ enum wined3d_sm4_opcode
WINED3D_SM4_OP_IMIN = 0x25,
WINED3D_SM4_OP_IMUL = 0x26,
WINED3D_SM4_OP_INE = 0x27,
+ WINED3D_SM4_OP_INEG = 0x28,
WINED3D_SM4_OP_ISHL = 0x29,
WINED3D_SM4_OP_ITOF = 0x2b,
WINED3D_SM4_OP_LD = 0x2d,
@@ -280,6 +281,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] =
{WINED3D_SM4_OP_IMIN, WINED3DSIH_IMIN, "I", "II"},
{WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"},
{WINED3D_SM4_OP_INE, WINED3DSIH_INE, "U", "II"},
+ {WINED3D_SM4_OP_INEG, WINED3DSIH_INEG, "I", "I"},
{WINED3D_SM4_OP_ISHL, WINED3DSIH_ISHL, "I", "II"},
{WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, "F", "I"},
{WINED3D_SM4_OP_LD, WINED3DSIH_LD, "U", "IR"},
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index 22dd551..07007c0 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -507,6 +507,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_IMIN,
WINED3DSIH_IMUL,
WINED3DSIH_INE,
+ WINED3DSIH_INEG,
WINED3DSIH_ISHL,
WINED3DSIH_ITOF,
WINED3DSIH_LABEL,
--
2.4.10
More information about the wine-patches
mailing list