Module: wine Branch: master Commit: 3df7e0bbbe45f93821a7a9a3196b6cab9670ce90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3df7e0bbbe45f93821a7a9a319...
Author: Józef Kucia jkucia@codeweavers.com Date: Mon Jan 11 11:53:23 2016 +0100
wined3d: Recognize SM4 ine opcode.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@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 5aa5669..ac7964e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5263,6 +5263,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMAX */ NULL, /* WINED3DSIH_IMIN */ NULL, /* WINED3DSIH_IMUL */ NULL, + /* WINED3DSIH_INE */ 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 218585c..f11acc4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7911,6 +7911,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMUL */ shader_glsl_imul, + /* WINED3DSIH_INE */ 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 ef6b141..3ddaa0f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -91,6 +91,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMAX */ "imax", /* WINED3DSIH_IMIN */ "imin", /* WINED3DSIH_IMUL */ "imul", + /* WINED3DSIH_INE */ "ine", /* WINED3DSIH_ISHL */ "ishl", /* WINED3DSIH_ITOF */ "itof", /* WINED3DSIH_LABEL */ "label", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 91db7da..4636c5f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -104,6 +104,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IMAX = 0x24, WINED3D_SM4_OP_IMIN = 0x25, WINED3D_SM4_OP_IMUL = 0x26, + WINED3D_SM4_OP_INE = 0x27, WINED3D_SM4_OP_ISHL = 0x29, WINED3D_SM4_OP_ITOF = 0x2b, WINED3D_SM4_OP_LD = 0x2d, @@ -278,6 +279,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IMAX, WINED3DSIH_IMAX, "I", "II"}, {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_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 8274a98..22dd551 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -506,6 +506,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMAX, WINED3DSIH_IMIN, WINED3DSIH_IMUL, + WINED3DSIH_INE, WINED3DSIH_ISHL, WINED3DSIH_ITOF, WINED3DSIH_LABEL,