[1/7] d3dx9: ID3DXConstantTable::SetMatrix should set scalar constants.
Józef Kucia
joseph.kucia at gmail.com
Mon Aug 20 10:10:18 CDT 2012
---
dlls/d3dx9_36/shader.c | 6 ++++++
dlls/d3dx9_36/tests/shader.c | 8 ++++++++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index 9482518..faab0a4 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -988,6 +988,12 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev
row_offset = 4;
registers_per_matrix = desc.Rows;
}
+ else if (desc.Class == D3DXPC_SCALAR)
+ {
+ column_offset = 1;
+ row_offset = 1;
+ registers_per_matrix = 1;
+ }
else
{
FIXME("Unhandled variable class %#x\n", desc.Class);
diff --git a/dlls/d3dx9_36/tests/shader.c b/dlls/d3dx9_36/tests/shader.c
index 8bfea43..4bddc9d 100644
--- a/dlls/d3dx9_36/tests/shader.c
+++ b/dlls/d3dx9_36/tests/shader.c
@@ -636,6 +636,14 @@ static void test_setting_basic_table(IDirect3DDevice9 *device)
"The variable f was not set correctly by ID3DXConstantTable_SetVector, got %f, should be %f\n",
out[0], f4.x);
+ res = ID3DXConstantTable_SetMatrix(ctable, device, "f", &mvp);
+ ok(res == D3D_OK, "ID3DXConstantTable_SetMatrix failed on variable f: 0x%08x\n", res);
+
+ IDirect3DDevice9_GetVertexShaderConstantF(device, 6, out, 1);
+ ok(out[0] == U(S(mvp))._11 && out[1] == 0.0f && out[2] == 0.0f && out[3] == 0.0f,
+ "The variable f was not set correctly by ID3DXConstantTable_SetMatrix, got %f, should be %f\n",
+ out[0], U(S(mvp))._11);
+
refcnt = ID3DXConstantTable_Release(ctable);
ok(refcnt == 0, "The constant table reference count was %u, should be 0\n", refcnt);
}
--
1.7.8.6
More information about the wine-patches
mailing list