Henri Verbeet : wined3d: Compare num_params against 1 in shader_glsl_map2gl ().

Alexandre Julliard julliard at winehq.org
Thu Apr 2 10:42:41 CDT 2009


Module: wine
Branch: master
Commit: fb6547a3e121fe0b0511526247d6ebb538ffc19e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=fb6547a3e121fe0b0511526247d6ebb538ffc19e

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Apr  2 10:41:00 2009 +0200

wined3d: Compare num_params against 1 in shader_glsl_map2gl().

num_params includes the destination parameter, while we're only interested in
source parameters. This doesn't cause problems for any of the instrctions
currently handled by shader_glsl_map2gl() though, since they all happen to
have at least 1 source parameter.

---

 dlls/wined3d/glsl_shader.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 7b7a7b3..9953764 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1740,7 +1740,8 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins)
 
     shader_addline(buffer, "%s(", instruction);
 
-    if (curOpcode->num_params > 0) {
+    if (curOpcode->num_params > 1)
+    {
         shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], write_mask, &src_param);
         shader_addline(buffer, "%s", src_param.param_str);
         for (i = 2; i < curOpcode->num_params; ++i) {




More information about the wine-cvs mailing list