Module: wine Branch: master Commit: 5840ea47e6a0d761acbd45cd5a59fbcebfb86326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5840ea47e6a0d761acbd45cd5a...
Author: Guillaume Charifi guillaume.charifi@sfr.fr Date: Thu Jun 2 12:46:54 2016 +0200
wined3d: Add support for the ishr opcode.
Signed-off-by: Guillaume Charifi guillaume.charifi@sfr.fr 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 | 2 ++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1093a36..6096555 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5291,6 +5291,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_INE */ NULL, /* WINED3DSIH_INEG */ NULL, /* WINED3DSIH_ISHL */ NULL, + /* WINED3DSIH_ISHR */ NULL, /* WINED3DSIH_ITOF */ NULL, /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LD */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 77b1de6..a60244b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3138,6 +3138,7 @@ static void shader_glsl_binop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_DIV: op = "/"; break; case WINED3DSIH_IADD: op = "+"; break; case WINED3DSIH_ISHL: op = "<<"; break; + case WINED3DSIH_ISHR: op = ">>"; break; case WINED3DSIH_MUL: op = "*"; break; case WINED3DSIH_OR: op = "|"; break; case WINED3DSIH_SUB: op = "-"; break; @@ -8602,6 +8603,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_INE */ shader_glsl_relop, /* WINED3DSIH_INEG */ shader_glsl_unary_op, /* WINED3DSIH_ISHL */ shader_glsl_binop, + /* WINED3DSIH_ISHR */ shader_glsl_binop, /* WINED3DSIH_ITOF */ shader_glsl_to_float, /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b41a509..6dffe33 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -123,6 +123,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_INE */ "ine", /* WINED3DSIH_INEG */ "ineg", /* WINED3DSIH_ISHL */ "ishl", + /* WINED3DSIH_ISHR */ "ishr", /* WINED3DSIH_ITOF */ "itof", /* WINED3DSIH_LABEL */ "label", /* WINED3DSIH_LD */ "ld", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index eb8e4e5..e9aa22a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -141,6 +141,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_INE = 0x27, WINED3D_SM4_OP_INEG = 0x28, WINED3D_SM4_OP_ISHL = 0x29, + WINED3D_SM4_OP_ISHR = 0x2a, WINED3D_SM4_OP_ITOF = 0x2b, WINED3D_SM4_OP_LD = 0x2d, WINED3D_SM4_OP_LD2DMS = 0x2e, @@ -651,6 +652,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {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_ISHR, WINED3DSIH_ISHR, "i", "ii"}, {WINED3D_SM4_OP_ITOF, WINED3DSIH_ITOF, "f", "i"}, {WINED3D_SM4_OP_LD, WINED3DSIH_LD, "u", "iR"}, {WINED3D_SM4_OP_LD2DMS, WINED3DSIH_LD2DMS, "u", "iRi"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ba28e51..879ea0b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -630,6 +630,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_INE, WINED3DSIH_INEG, WINED3DSIH_ISHL, + WINED3DSIH_ISHR, WINED3DSIH_ITOF, WINED3DSIH_LABEL, WINED3DSIH_LD,
-
Alexandre Julliard