Paul Gofman : d3dx9: Fix a warning output in preshader.

[Alexandre Julliard]

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

Author: Paul Gofman 
Date:   Thu Mar 23 18:06:57 2017 +0300

d3dx9: Fix a warning output in preshader.

Signed-off-by: Paul Gofman 
Signed-off-by: Matteo Bruni 
Signed-off-by: Alexandre Julliard

---

dlls/d3dx9_36/preshader.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c
index b650f33..9aedc99 100644
--- a/dlls/d3dx9_36/preshader.c
+++ b/dlls/d3dx9_36/preshader.c
@@ -1088,16 +1088,11 @@ static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstan
     return ret;
 }

-static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_ins *ins,
-        const struct d3dx_pres_operand *opr, unsigned int comp)
+static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *opr, unsigned int comp)
 {
     if (!regstore_is_val_set_reg(rs, opr->table, (opr->offset + comp) / table_info[opr->table].reg_component_count))
-    {
-        WARN("Using uninitialized input ");
-        dump_arg(rs, opr, comp);
-        TRACE(".\n");
-        dump_ins(rs, ins);
-    }
+        WARN("Using uninitialized input, table %u, offset %u.\n", opr->table, opr->offset + comp);
+
     return regstore_get_double(rs, opr->table, opr->offset + comp);
 }

@@ -1130,7 +1125,7 @@ static HRESULT execute_preshader(struct d3dx_preshader *pres)
             }
             for (k = 0; k < oi->input_count; ++k)
                 for (j = 0; j < ins->component_count; ++j)
-                    args[k * ins->component_count + j] = exec_get_arg(&pres->regs, ins, &ins->inputs[k],
+                    args[k * ins->component_count + j] = exec_get_arg(&pres->regs, &ins->inputs[k],
                             ins->scalar_op && !k ? 0 : j);
             res = oi->func(args, ins->component_count);

@@ -1142,7 +1137,7 @@ static HRESULT execute_preshader(struct d3dx_preshader *pres)
             for (j = 0; j < ins->component_count; ++j)
             {
                 for (k = 0; k < oi->input_count; ++k)
-                    args[k] = exec_get_arg(&pres->regs, ins, &ins->inputs[k], ins->scalar_op && !k ? 0 : j);
+                    args[k] = exec_get_arg(&pres->regs, &ins->inputs[k], ins->scalar_op && !k ? 0 : j);
                 res = oi->func(args, ins->component_count);
                 exec_set_arg(&pres->regs, &ins->output, j, res);
             }