Paul Gofman : d3dx9: Set reg_component_count to 4 for immediate constants.

[Alexandre Julliard]

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

Author: Paul Gofman <gofmanp(a)gmail.com>
Date:   Fri Apr 28 00:53:46 2017 +0200

d3dx9: Set reg_component_count to 4 for immediate constants.

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3dx9_36/preshader.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c
index a5a8bb7..b17d0b5 100644
--- a/dlls/d3dx9_36/preshader.c
+++ b/dlls/d3dx9_36/preshader.c
@@ -155,7 +155,7 @@ static const struct
 }
 table_info[] =
 {
-    {sizeof(double), 1, PRES_VT_DOUBLE}, /* PRES_REGTAB_IMMED */
+    {sizeof(double), 4, PRES_VT_DOUBLE}, /* PRES_REGTAB_IMMED */
     {sizeof(float),  4, PRES_VT_FLOAT }, /* PRES_REGTAB_CONST */
     {sizeof(float),  4, PRES_VT_FLOAT }, /* PRES_REGTAB_OCONST */
     {sizeof(BOOL),   1, PRES_VT_BOOL  }, /* PRES_REGTAB_OBCONST */
@@ -653,7 +653,7 @@ static void dump_ins(struct d3dx_regstore *rs, const struct d3dx_pres_ins *ins)
 
 static void dump_preshader(struct d3dx_preshader *pres)
 {
-    unsigned int i, immediate_count = pres->regs.table_sizes[PRES_REGTAB_IMMED];
+    unsigned int i, immediate_count = pres->regs.table_sizes[PRES_REGTAB_IMMED] * 4;
     const double *immediates = pres->regs.tables[PRES_REGTAB_IMMED];
 
     if (immediate_count)
@@ -747,7 +747,14 @@ static HRESULT parse_preshader(struct d3dx_preshader *pres, unsigned int *ptr, u
     if (FAILED(hr))
         return hr;
 
-    pres->regs.table_sizes[PRES_REGTAB_IMMED] = const_count;
+    if (const_count % table_info[PRES_REGTAB_IMMED].reg_component_count)
+    {
+        FIXME("const_count %u is not a multiple of %u.\n", const_count,
+                table_info[PRES_REGTAB_IMMED].reg_component_count);
+        return D3DXERR_INVALIDDATA;
+    }
+    pres->regs.table_sizes[PRES_REGTAB_IMMED] = const_count
+            / table_info[PRES_REGTAB_IMMED].reg_component_count;
 
     update_table_sizes_consts(pres->regs.table_sizes, &pres->inputs);
     for (i = 0; i < pres->ins_count; ++i)
@@ -1183,9 +1190,7 @@ static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_oper
     else
         base_index = lrint(exec_get_reg_value(rs, opr->index_reg.table, opr->index_reg.offset));
 
-    /* '4' is used instead of reg_component_count, as immediate constants (which have
-     *  reg_component_count of 1) are still indexed as 4 values according to the tests. */
-    offset = base_index * 4 + opr->reg.offset + comp;
+    offset = base_index * table_info[table].reg_component_count + opr->reg.offset + comp;
     reg_index = offset / table_info[table].reg_component_count;
 
     if (reg_index >= rs->table_sizes[table])