=?UTF-8?Q?Rico=20Sch=C3=BCller=20?=: d3dx9: Remove min() in set_matrix_array(), uses always the desc value.
Alexandre Julliard
julliard at winehq.org
Tue Aug 28 14:44:41 CDT 2012
Module: wine
Branch: master
Commit: edb802a84777ae2ed193daf462d7fe78fab68c8d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=edb802a84777ae2ed193daf462d7fe78fab68c8d
Author: Rico Schüller <kgbricola at web.de>
Date: Tue Aug 28 13:43:09 2012 +0200
d3dx9: Remove min() in set_matrix_array(), uses always the desc value.
---
dlls/d3dx9_36/shader.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index fa72cfc..4b831e3 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -1187,13 +1187,13 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev
{
if (desc->Class == D3DXPC_VECTOR) return D3D_OK;
- num_rows = min(desc->Rows, rows);
- num_columns = min(desc->Columns, columns);
+ num_rows = desc->Rows;
+ num_columns = desc->Columns;
}
else
{
- num_rows = min(desc->Columns, columns);
- num_columns = min(desc->Rows, rows);
+ num_rows = desc->Columns;
+ num_columns = desc->Rows;
}
registers_per_matrix = (desc->Class == D3DXPC_MATRIX_COLUMNS) ? desc->Columns : desc->Rows;
More information about the wine-cvs
mailing list