[v10 1/4] d3dx9: Implement fxlc constants (expressions) in effect.
Paul Gofman
gofmanp at gmail.com
Thu Apr 7 10:41:32 CDT 2016
Signed-off-by: Paul Gofman <gofmanp at gmail.com>
---
Changes
- regstore_get_double(): put FIXME on int or BOOL input intead of cast.
- regstore_set_double(): change roundf() to lrint() (casts to BOOL and integer cannot
be replaced as preshaders can output BOOL and int for shader or state value)
- fixed operator placement on line continuation in set_constants_param()
- Changed d3dx_evaluate_parameter() function declaration and implementation to
use output value pointer from function parameter and not to use param->data,
updated its usage accordingly
dlls/d3dx9_36/d3dx9_private.h | 2 +
dlls/d3dx9_36/effect.c | 79 +++++++-----
dlls/d3dx9_36/preshader.c | 291 ++++++++++++++++++++++++++++++++++++++++++
dlls/d3dx9_36/tests/effect.c | 4 +-
4 files changed, 341 insertions(+), 35 deletions(-)
diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
index 3b1c7ee..556d213 100644
--- a/dlls/d3dx9_36/d3dx9_private.h
+++ b/dlls/d3dx9_36/d3dx9_private.h
@@ -193,5 +193,7 @@ struct d3dx_parameter *get_parameter_by_name(struct d3dx9_base_effect *base,
void d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte_code,
unsigned int byte_code_size, D3DXPARAMETER_TYPE type, struct d3dx_param_eval **peval) DECLSPEC_HIDDEN;
void d3dx_free_param_eval(struct d3dx_param_eval *peval) DECLSPEC_HIDDEN;
+HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval,
+ const struct d3dx_parameter *param, void *param_value) DECLSPEC_HIDDEN;
#endif /* __WINE_D3DX9_PRIVATE_H */
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 76a012d..4c50a59 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -2493,13 +2493,19 @@ static HRESULT d3dx9_base_effect_set_array_range(struct d3dx9_base_effect *base,
static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass,
struct d3dx_state *state, void **param_value, struct d3dx_parameter **out_param)
{
- struct d3dx_parameter *param;
- param = state->parameter.referenced_param ? state->parameter.referenced_param : &state->parameter;
+ struct d3dx_parameter *param = &state->parameter;
+
+ *param_value = NULL;
+ *out_param = NULL;
switch (state->type)
{
case ST_CONSTANT:
+ *param_value = param->data;
+ *out_param = param;
+ return D3D_OK;
case ST_PARAMETER:
+ param = param->referenced_param;
*param_value = param->data;
*out_param = param;
return D3D_OK;
@@ -2507,11 +2513,18 @@ static HRESULT d3dx9_get_param_value_ptr(struct ID3DXEffectImpl *effect, struct
FIXME("Array selector.\n");
break;
case ST_FXLC:
- FIXME("FXLC not supported yet.\n");
- break;
+ if (param->param_eval)
+ {
+ *out_param = param;
+ *param_value = param->data;
+ return d3dx_evaluate_parameter(param->param_eval, param, *param_value);
+ }
+ else
+ {
+ FIXME("No preshader for FXLC parameter.\n");
+ return D3DERR_INVALIDCALL;
+ }
}
- *param_value = NULL;
- *out_param = NULL;
return E_NOTIMPL;
}
@@ -2524,19 +2537,19 @@ static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void
}
light_tbl[] =
{
- {FIELD_OFFSET(D3DLIGHT9, Type), "LC_TYPE"},
- {FIELD_OFFSET(D3DLIGHT9, Diffuse), "LT_DIFFUSE"},
- {FIELD_OFFSET(D3DLIGHT9, Specular), "LT_SPECULAR"},
- {FIELD_OFFSET(D3DLIGHT9, Ambient), "LT_AMBIENT"},
- {FIELD_OFFSET(D3DLIGHT9, Position), "LT_POSITION"},
- {FIELD_OFFSET(D3DLIGHT9, Direction), "LT_DIRECTION"},
- {FIELD_OFFSET(D3DLIGHT9, Range), "LT_RANGE"},
- {FIELD_OFFSET(D3DLIGHT9, Falloff), "LT_FALLOFF"},
- {FIELD_OFFSET(D3DLIGHT9, Attenuation0), "LT_ATTENUATION0"},
- {FIELD_OFFSET(D3DLIGHT9, Attenuation1), "LT_ATTENUATION1"},
- {FIELD_OFFSET(D3DLIGHT9, Attenuation2), "LT_ATTENUATION2"},
- {FIELD_OFFSET(D3DLIGHT9, Theta), "LT_THETA"},
- {FIELD_OFFSET(D3DLIGHT9, Phi), "LT_PHI"}
+ {FIELD_OFFSET(D3DLIGHT9, Type), "LC_TYPE"},
+ {FIELD_OFFSET(D3DLIGHT9, Diffuse), "LT_DIFFUSE"},
+ {FIELD_OFFSET(D3DLIGHT9, Specular), "LT_SPECULAR"},
+ {FIELD_OFFSET(D3DLIGHT9, Ambient), "LT_AMBIENT"},
+ {FIELD_OFFSET(D3DLIGHT9, Position), "LT_POSITION"},
+ {FIELD_OFFSET(D3DLIGHT9, Direction), "LT_DIRECTION"},
+ {FIELD_OFFSET(D3DLIGHT9, Range), "LT_RANGE"},
+ {FIELD_OFFSET(D3DLIGHT9, Falloff), "LT_FALLOFF"},
+ {FIELD_OFFSET(D3DLIGHT9, Attenuation0), "LT_ATTENUATION0"},
+ {FIELD_OFFSET(D3DLIGHT9, Attenuation1), "LT_ATTENUATION1"},
+ {FIELD_OFFSET(D3DLIGHT9, Attenuation2), "LT_ATTENUATION2"},
+ {FIELD_OFFSET(D3DLIGHT9, Theta), "LT_THETA"},
+ {FIELD_OFFSET(D3DLIGHT9, Phi), "LT_PHI"}
};
switch (op)
{
@@ -2550,8 +2563,8 @@ static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void
{
D3DCOLORVALUE c = *(D3DCOLORVALUE *)value;
- TRACE("%s (%f %f %f %f).\n", light_tbl[op].name, c.r, c.g, c.b, c.a);
- *(D3DCOLORVALUE *)((char *)light + light_tbl[op].offset) = c;
+ TRACE("%s (%.8e %.8e %.8e %.8e).\n", light_tbl[op].name, c.r, c.g, c.b, c.a);
+ *(D3DCOLORVALUE *)((BYTE *)light + light_tbl[op].offset) = c;
break;
}
case LT_POSITION:
@@ -2559,8 +2572,8 @@ static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void
{
D3DVECTOR v = *(D3DVECTOR *)value;
- TRACE("%s (%f %f %f).\n", light_tbl[op].name, v.x, v.y, v.z);
- *(D3DVECTOR *)((char *)light + light_tbl[op].offset) = v;
+ TRACE("%s (%.8e %.8e %.8e).\n", light_tbl[op].name, v.x, v.y, v.z);
+ *(D3DVECTOR *)((BYTE *)light + light_tbl[op].offset) = v;
break;
}
case LT_RANGE:
@@ -2572,8 +2585,8 @@ static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void
case LT_PHI:
{
float v = *(float *)value;
- TRACE("%s %f.\n", light_tbl[op].name, v);
- *(float *)((char *)light + light_tbl[op].offset) = v;
+ TRACE("%s %.8e.\n", light_tbl[op].name, v);
+ *(float *)((BYTE *)light + light_tbl[op].offset) = v;
break;
}
default:
@@ -2591,11 +2604,11 @@ static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *ma
}
material_tbl[] =
{
- {FIELD_OFFSET(D3DMATERIAL9, Diffuse), "MT_DIFFUSE"},
- {FIELD_OFFSET(D3DMATERIAL9, Ambient), "MT_AMBIENT"},
- {FIELD_OFFSET(D3DMATERIAL9, Specular), "MT_SPECULAR"},
- {FIELD_OFFSET(D3DMATERIAL9, Emissive), "MT_EMISSIVE"},
- {FIELD_OFFSET(D3DMATERIAL9, Power), "MT_POWER"}
+ {FIELD_OFFSET(D3DMATERIAL9, Diffuse), "MT_DIFFUSE"},
+ {FIELD_OFFSET(D3DMATERIAL9, Ambient), "MT_AMBIENT"},
+ {FIELD_OFFSET(D3DMATERIAL9, Specular), "MT_SPECULAR"},
+ {FIELD_OFFSET(D3DMATERIAL9, Emissive), "MT_EMISSIVE"},
+ {FIELD_OFFSET(D3DMATERIAL9, Power), "MT_POWER"}
};
switch (op)
@@ -2604,7 +2617,7 @@ static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *ma
{
float v = *(float *)value;
- TRACE("%s %f.\n", material_tbl[op].name, v);
+ TRACE("%s %.8e.\n", material_tbl[op].name, v);
material->Power = v;
break;
}
@@ -2615,8 +2628,8 @@ static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *ma
{
D3DCOLORVALUE c = *(D3DCOLORVALUE *)value;
- TRACE("%s, value (%f %f %f %f).\n", material_tbl[op].name, c.r, c.g, c.b, c.a);
- *(D3DCOLORVALUE *)((char *)material + material_tbl[op].offset) = c;
+ TRACE("%s, value (%.8e %.8e %.8e %.8e).\n", material_tbl[op].name, c.r, c.g, c.b, c.a);
+ *(D3DCOLORVALUE *)((BYTE *)material + material_tbl[op].offset) = c;
break;
}
default:
diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c
index 67b4d65..a21cdb2 100644
--- a/dlls/d3dx9_36/preshader.c
+++ b/dlls/d3dx9_36/preshader.c
@@ -196,6 +196,47 @@ static void regstore_set_values(struct d3dx_regstore *rs, unsigned int table, vo
}
}
+static unsigned int regstore_is_val_set_reg(struct d3dx_regstore *rs, unsigned int table, unsigned int reg_idx)
+{
+ return rs->table_value_set[table][reg_idx / PRES_BITMASK_BLOCK_SIZE] &
+ (1u << (reg_idx % PRES_BITMASK_BLOCK_SIZE));
+}
+
+static double regstore_get_double(struct d3dx_regstore *rs, unsigned int table, unsigned int offset)
+{
+ BYTE *p;
+
+ p = (BYTE *)rs->tables[table] + table_info[table].component_size * offset;
+ switch (table_info[table].type)
+ {
+ case PRES_VT_FLOAT:
+ return *(float *)p;
+ case PRES_VT_DOUBLE:
+ return *(double *)p;
+ default:
+ FIXME("Unexpected preshader input from table %u.\n", table);
+ return NAN;
+ }
+}
+
+static void regstore_set_double(struct d3dx_regstore *rs, unsigned int table, unsigned int offset, double v)
+{
+ BYTE *p;
+ unsigned int reg_idx;
+
+ p = (BYTE *)rs->tables[table] + table_info[table].component_size * offset;
+ switch (table_info[table].type)
+ {
+ case PRES_VT_FLOAT : *(float *)p = v; break;
+ case PRES_VT_DOUBLE: *(double *)p = v; break;
+ case PRES_VT_INT : *(int *)p = lrint(v); break;
+ case PRES_VT_BOOL : *(BOOL *)p = !!v; break;
+ }
+ reg_idx = get_reg_offset(table, offset);
+ rs->table_value_set[table][reg_idx / PRES_BITMASK_BLOCK_SIZE] |=
+ 1u << (reg_idx % PRES_BITMASK_BLOCK_SIZE);
+}
+
static void dump_bytecode(void *data, unsigned int size)
{
unsigned int *bytecode = (unsigned int *)data;
@@ -689,3 +730,253 @@ void d3dx_free_param_eval(struct d3dx_param_eval *peval)
d3dx_free_const_tab(&peval->shader_inputs);
HeapFree(GetProcessHeap(), 0, peval);
}
+
+static HRESULT set_constants_param(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab,
+ D3DXHANDLE hc, struct d3dx_parameter *param)
+{
+ ID3DXConstantTable *ctab = const_tab->ctab;
+ D3DXCONSTANT_DESC desc;
+ unsigned int const_count, param_count, i, j, n, table, start_offset;
+ unsigned int minor, major, major_stride, param_offset;
+ BOOL transpose, get_element;
+
+ ID3DXConstantTable_GetConstantDesc(ctab, hc, &desc, &const_count);
+
+ if (param->element_count)
+ {
+ param_count = param->element_count;
+ const_count = desc.Elements;
+ get_element = TRUE;
+ }
+ else
+ {
+ if (desc.Elements > 1)
+ {
+ FIXME("Unexpected number of constant elements %u.\n", desc.Elements);
+ return D3DERR_INVALIDCALL;
+ }
+ param_count = param->member_count;
+ const_count = desc.StructMembers;
+ get_element = FALSE;
+ }
+ if (const_count != param_count)
+ {
+ FIXME("Number of elements or struct members differs between parameter and constant.\n");
+ return D3DERR_INVALIDCALL;
+ }
+ if (const_count)
+ {
+ HRESULT hr, ret;
+ D3DXHANDLE hc_element;
+
+ ret = D3D_OK;
+ for (i = 0; i < const_count; ++i)
+ {
+ if (get_element)
+ hc_element = ID3DXConstantTable_GetConstantElement(ctab, hc, i);
+ else
+ hc_element = ID3DXConstantTable_GetConstant(ctab, hc, i);
+ if (!hc_element)
+ {
+ FIXME("Could not get constant.\n");
+ hr = D3DERR_INVALIDCALL;
+ }
+ else
+ {
+ hr = set_constants_param(rs, const_tab, hc_element, ¶m->members[i]);
+ }
+ if (FAILED(hr))
+ ret = hr;
+ }
+ return ret;
+ }
+
+ transpose = (desc.Class == D3DXPC_MATRIX_COLUMNS && param->class == D3DXPC_MATRIX_ROWS)
+ || (param->class == D3DXPC_MATRIX_COLUMNS && desc.Class == D3DXPC_MATRIX_ROWS);
+ if (desc.Class == D3DXPC_MATRIX_COLUMNS)
+ {
+ major = param->columns;
+ minor = param->rows;
+ }
+ else
+ {
+ major = param->rows;
+ minor = param->columns;
+ }
+
+ TRACE("Constant %s, rows %u, columns %u, class %u, bytes %u.\n",
+ debugstr_a(desc.Name), desc.Rows, desc.Columns, desc.Class, desc.Bytes);
+ TRACE("Parameter %s, rows %u, columns %u, class %u, flags %#x, bytes %u, transpose %#x.\n",
+ debugstr_a(param->name), param->rows, param->columns, param->class,
+ param->flags, param->bytes, transpose);
+
+ table = const_tab->regset2table[desc.RegisterSet];
+ if (table >= PRES_REGTAB_COUNT)
+ {
+ FIXME("Unexpected register set %u.\n", desc.RegisterSet);
+ return D3DERR_INVALIDCALL;
+ }
+ start_offset = desc.RegisterIndex * table_info[table].reg_component_count;
+ major_stride = max(minor, table_info[table].reg_component_count);
+ n = min(major * major_stride,
+ desc.RegisterCount * table_info[table].reg_component_count + major_stride - 1) / major_stride;
+ for (i = 0; i < n; ++i)
+ {
+ for (j = 0; j < minor; ++j)
+ {
+ unsigned int out;
+ unsigned int *in;
+ unsigned int offset;
+
+ offset = start_offset + i * major_stride + j;
+ if (offset / table_info[table].reg_component_count >= rs->table_sizes[table])
+ {
+ if (table_info[table].reg_component_count != 1)
+ FIXME("Output offset exceeds table size, name %s, component %u.\n", desc.Name, i);
+ break;
+ }
+ if (transpose)
+ param_offset = i + j * major;
+ else
+ param_offset = i * minor + j;
+ if (param_offset * sizeof(unsigned int) >= param->bytes)
+ {
+ WARN("Parameter data is too short, name %s, component %u.\n", desc.Name, i);
+ break;
+ }
+
+ in = (unsigned int *)param->data + param_offset;
+ /* TODO: store data transfer / convert operation instead of performing an operation
+ from here, to move this to parsing stage */
+ switch (table_info[table].type)
+ {
+ case PRES_VT_FLOAT: set_number(&out, D3DXPT_FLOAT, in, param->type); break;
+ case PRES_VT_INT: set_number(&out, D3DXPT_INT, in, param->type); break;
+ case PRES_VT_BOOL: set_number(&out, D3DXPT_BOOL, in, param->type); break;
+ default:
+ FIXME("Unexpected type %#x.\n", table_info[table].type);
+ break;
+ }
+ regstore_set_values(rs, table, &out, offset, 1);
+ }
+ }
+
+ return D3D_OK;
+}
+
+static HRESULT set_constants(struct d3dx_regstore *rs, struct d3dx_const_tab *const_tab)
+{
+ unsigned int i;
+ HRESULT hr, ret;
+ D3DXHANDLE hc;
+
+ ret = D3D_OK;
+ for (i = 0; i < const_tab->input_count; ++i)
+ {
+ if (!const_tab->inputs_param[i] || const_tab->inputs_param[i]->class == D3DXPC_OBJECT)
+ continue;
+ hc = ID3DXConstantTable_GetConstant(const_tab->ctab, NULL, i);
+ if (!hc)
+ {
+ FIXME("Could not get constant.\n");
+ hr = D3DERR_INVALIDCALL;
+ }
+ else
+ {
+ hr = set_constants_param(rs, const_tab, hc, const_tab->inputs_param[i]);
+ }
+ if (FAILED(hr))
+ ret = hr;
+ }
+ 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)
+{
+ 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);
+ }
+ return regstore_get_double(rs, opr->table, opr->offset + comp);
+}
+
+static void exec_set_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *opr,
+ unsigned int comp, double res)
+{
+ regstore_set_double(rs, opr->table, opr->offset + comp, res);
+}
+
+#define ARGS_ARRAY_SIZE 8
+static HRESULT execute_preshader(struct d3dx_preshader *pres)
+{
+ unsigned int i, j, k;
+ double args[ARGS_ARRAY_SIZE];
+ double res;
+
+ for (i = 0; i < pres->ins_count; ++i)
+ {
+ const struct d3dx_pres_ins *ins;
+ const struct op_info *oi;
+
+ ins = &pres->ins[i];
+ oi = &pres_op_info[ins->op];
+ if (oi->func_all_comps)
+ {
+ if (oi->input_count * ins->component_count > ARGS_ARRAY_SIZE)
+ {
+ FIXME("Too many arguments (%u) for one instruction.\n", oi->input_count * ins->component_count);
+ return E_FAIL;
+ }
+ 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],
+ ins->scalar_op && !k ? 0 : j);
+ res = oi->func(args, ins->component_count);
+
+ /* only 'dot' instruction currently falls here */
+ exec_set_arg(&pres->regs, &ins->output, 0, res);
+ }
+ else
+ {
+ 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);
+ res = oi->func(args, ins->component_count);
+ exec_set_arg(&pres->regs, &ins->output, j, res);
+ }
+ }
+ }
+ return D3D_OK;
+}
+
+HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval, const struct d3dx_parameter *param, void *param_value)
+{
+ HRESULT hr;
+ unsigned int i;
+ unsigned int elements, elements_param, elements_table;
+ float *oc;
+
+ TRACE("peval %p, param %p, param_value %p.\n", peval, param, param_value);
+
+ hr = set_constants(&peval->pres.regs, &peval->pres.inputs);
+ if (FAILED(hr))
+ return hr;
+
+ hr = execute_preshader(&peval->pres);
+ if (FAILED(hr))
+ return hr;
+
+ elements_table = table_info[PRES_REGTAB_OCONST].reg_component_count
+ * peval->pres.regs.table_sizes[PRES_REGTAB_OCONST];
+ elements_param = param->bytes / sizeof(unsigned int);
+ elements = min(elements_table, elements_param);
+ oc = (float *)peval->pres.regs.tables[PRES_REGTAB_OCONST];
+ for (i = 0; i < elements; ++i)
+ set_number((unsigned int *)param_value + i, param->type, oc + i, D3DXPT_FLOAT);
+ return D3D_OK;
+}
diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c
index c388e7d..4f017bd 100644
--- a/dlls/d3dx9_36/tests/effect.c
+++ b/dlls/d3dx9_36/tests/effect.c
@@ -2917,7 +2917,7 @@ static void test_effect_states(IDirect3DDevice9 *device)
ok(!memcmp(mat.m, test_mat.m, sizeof(mat)), "World matrix does not match.\n");
hr = effect->lpVtbl->BeginPass(effect, 0);
- todo_wine ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr);
+ ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr);
hr = IDirect3DDevice9_GetTransform(device, D3DTS_WORLDMATRIX(1), &mat);
ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr);
@@ -2925,7 +2925,7 @@ static void test_effect_states(IDirect3DDevice9 *device)
hr = IDirect3DDevice9_GetTransform(device, D3DTS_VIEW, &mat);
ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr);
- todo_wine ok(!memcmp(mat.m, test_mat_camera.m, sizeof(mat)), "View matrix does not match.\n");
+ ok(!memcmp(mat.m, test_mat_camera.m, sizeof(mat)), "View matrix does not match.\n");
hr = IDirect3DDevice9_GetRenderState(device, D3DRS_BLENDOP, &value);
ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr);
--
2.5.5
More information about the wine-patches
mailing list