H. Verbeet : wined3d: Pass the correct mask to
shader_glsl_add_src_param() in shader_glsl_breakc().
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Jan 16 10:07:48 CST 2007
Module: wine
Branch: master
Commit: 50e0deafcacb9657ca750e81e2216ecc72bdcc2c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e0deafcacb9657ca750e81e2216ecc72bdcc2c
Author: H. Verbeet <hverbeet at gmail.com>
Date: Mon Jan 15 19:36:29 2007 +0100
wined3d: Pass the correct mask to shader_glsl_add_src_param() in shader_glsl_breakc().
---
dlls/wined3d/glsl_shader.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 63c3fb1..ed501bc 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1459,14 +1459,15 @@ void shader_glsl_break(SHADER_OPCODE_ARG
shader_addline(arg->buffer, "break;\n");
}
+/* FIXME: According to MSDN the compare is done per component. */
void shader_glsl_breakc(SHADER_OPCODE_ARG* arg) {
char src0_str[100], src1_str[100];
char src0_reg[50], src1_reg[50];
char src0_mask[6], src1_mask[6];
- shader_glsl_add_src_param_old(arg, arg->src[0], arg->src_addr[0], src0_reg, src0_mask, src0_str);
- shader_glsl_add_src_param_old(arg, arg->src[1], arg->src_addr[1], src1_reg, src1_mask, src1_str);
+ shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, src0_reg, src0_mask, src0_str);
+ shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], WINED3DSP_WRITEMASK_0, src1_reg, src1_mask, src1_str);
shader_addline(arg->buffer, "if (%s %s %s) break;\n",
src0_str, shader_get_comp_op(arg->opcode_token), src1_str);
More information about the wine-cvs
mailing list