Henri Verbeet : wined3d: Handle a zero source value for WINED3DSIH_POW.
Alexandre Julliard
julliard at winehq.org
Thu May 27 10:46:42 CDT 2010
Module: wine
Branch: master
Commit: 6f57aabc0a1223e27b52fc6c752e7605fd9a87e1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f57aabc0a1223e27b52fc6c752e7605fd9a87e1
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Thu May 27 10:23:19 2010 +0200
wined3d: Handle a zero source value for WINED3DSIH_POW.
---
dlls/wined3d/glsl_shader.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 056e9ad..ba16eae 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -2213,10 +2213,15 @@ static void shader_glsl_pow(const struct wined3d_shader_instruction *ins)
shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src0_param);
shader_glsl_add_src_param(ins, &ins->src[1], WINED3DSP_WRITEMASK_0, &src1_param);
- if (dst_size > 1) {
- shader_addline(buffer, "vec%d(pow(abs(%s), %s)));\n", dst_size, src0_param.param_str, src1_param.param_str);
- } else {
- shader_addline(buffer, "pow(abs(%s), %s));\n", src0_param.param_str, src1_param.param_str);
+ if (dst_size > 1)
+ {
+ shader_addline(buffer, "vec%d(%s == 0.0 ? 0.0 : pow(abs(%s), %s)));\n",
+ dst_size, src0_param.param_str, src0_param.param_str, src1_param.param_str);
+ }
+ else
+ {
+ shader_addline(buffer, "%s == 0.0 ? 0.0 : pow(abs(%s), %s));\n",
+ src0_param.param_str, src0_param.param_str, src1_param.param_str);
}
}
More information about the wine-cvs
mailing list