From 22939f9d2966a37fbb05fe02d43c500050cc0727 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 6 Jan 2010 23:22:10 +0100 Subject: [PATCH] wined3d: Recognize the SM4 emit 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 d5c212b8126..81c30eb44b8 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4689,6 +4689,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DSX */ shader_hw_map2gl, /* WINED3DSIH_DSY */ shader_hw_dsy, /* WINED3DSIH_ELSE */ shader_hw_else, + /* WINED3DSIH_EMIT */ NULL, /* WINED3DSIH_ENDIF */ shader_hw_endif, /* WINED3DSIH_ENDLOOP */ shader_hw_endloop, /* WINED3DSIH_ENDREP */ shader_hw_endrep, diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index fbc6035226f..9636a5921fa 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -56,6 +56,7 @@ static const char *shader_opcode_names[] = /* WINED3DSIH_DSX */ "dsx", /* WINED3DSIH_DSY */ "dsy", /* WINED3DSIH_ELSE */ "else", + /* WINED3DSIH_EMIT */ "emit", /* WINED3DSIH_ENDIF */ "endif", /* WINED3DSIH_ENDLOOP */ "endloop", /* WINED3DSIH_ENDREP */ "endrep", diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 31e5b1f5ff6..c247ec27491 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4731,6 +4731,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DSX */ shader_glsl_map2gl, /* WINED3DSIH_DSY */ shader_glsl_map2gl, /* WINED3DSIH_ELSE */ shader_glsl_else, + /* WINED3DSIH_EMIT */ NULL, /* WINED3DSIH_ENDIF */ shader_glsl_end, /* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 7d753d3d673..033ff02b29e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -52,6 +52,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_BREAKC = 0x03, WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, + WINED3D_SM4_OP_EMIT = 0x13, WINED3D_SM4_OP_EXP = 0x19, WINED3D_SM4_OP_IGE = 0x21, WINED3D_SM4_OP_LOG = 0x2f, @@ -107,6 +108,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, 0, 1}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, 1, 2}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2}, + {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, 0, 0}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, 1, 2}, {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, 1, 1}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dc8aad8f8fe..42aa2cc41e2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -421,6 +421,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DSX, WINED3DSIH_DSY, WINED3DSIH_ELSE, + WINED3DSIH_EMIT, WINED3DSIH_ENDIF, WINED3DSIH_ENDLOOP, WINED3DSIH_ENDREP,