From 36876774278e34b1f28ce1d5b7236095b9f394e1 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 6 Jan 2010 23:22:12 +0100 Subject: [PATCH] wined3d: Recognize the SM4 lt opcode. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_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 b026c15ebb7..cf7a429e8fe 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4706,6 +4706,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_LOGP */ shader_hw_log_pow, /* WINED3DSIH_LOOP */ shader_hw_loop, /* WINED3DSIH_LRP */ shader_hw_lrp, + /* WINED3DSIH_LT */ NULL, /* WINED3DSIH_M3x2 */ shader_hw_mnxn, /* WINED3DSIH_M3x3 */ shader_hw_mnxn, /* WINED3DSIH_M3x4 */ shader_hw_mnxn, diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 65283050223..f0fe664ae71 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -73,6 +73,7 @@ static const char *shader_opcode_names[] = /* WINED3DSIH_LOGP */ "logp", /* WINED3DSIH_LOOP */ "loop", /* WINED3DSIH_LRP */ "lrp", + /* WINED3DSIH_LT */ "lt", /* WINED3DSIH_M3x2 */ "m3x2", /* WINED3DSIH_M3x3 */ "m3x3", /* WINED3DSIH_M3x4 */ "m3x4", diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e8c05448c12..344a266abec 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4748,6 +4748,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LOGP */ shader_glsl_log, /* WINED3DSIH_LOOP */ shader_glsl_loop, /* WINED3DSIH_LRP */ shader_glsl_lrp, + /* WINED3DSIH_LT */ NULL, /* WINED3DSIH_M3x2 */ shader_glsl_mnxn, /* WINED3DSIH_M3x3 */ shader_glsl_mnxn, /* WINED3DSIH_M3x4 */ shader_glsl_mnxn, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 0327d800dcb..b935eefc1ef 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -57,6 +57,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_IADD = 0x1e, WINED3D_SM4_OP_IGE = 0x21, WINED3D_SM4_OP_LOG = 0x2f, + WINED3D_SM4_OP_LT = 0x31, WINED3D_SM4_OP_MIN = 0x33, WINED3D_SM4_OP_MAX = 0x34, WINED3D_SM4_OP_MOV = 0x36, @@ -114,6 +115,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IADD, WINED3DSIH_IADD, 1, 2}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, 1, 2}, {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, 1, 1}, + {WINED3D_SM4_OP_LT, WINED3DSIH_LT, 1, 2}, {WINED3D_SM4_OP_MIN, WINED3DSIH_MIN, 1, 2}, {WINED3D_SM4_OP_MAX, WINED3DSIH_MAX, 1, 2}, {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fb299c5ba00..cba17b035a2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -438,6 +438,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_LOGP, WINED3DSIH_LOOP, WINED3DSIH_LRP, + WINED3DSIH_LT, WINED3DSIH_M3x2, WINED3DSIH_M3x3, WINED3DSIH_M3x4, -- 2.11.4.GIT