ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx9: Remove min() in set_matrix_array(), uses always the desc value.

Browse Source
This commit is contained in:
Rico Schüller 2012-08-28 13:43:09 +02:00 committed by Alexandre Julliard
parent b5b0520723
commit edb802a847
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/d3dx9_36/shader.c
View File

@ -1187,13 +1187,13 @@ static HRESULT set_matrix_array(ID3DXConstantTable *iface, IDirect3DDevice9 *dev
{ {
if (desc->Class == D3DXPC_VECTOR) return D3D_OK; if (desc->Class == D3DXPC_VECTOR) return D3D_OK;
num_rows = min(desc->Rows, rows); num_rows = desc->Rows;
num_columns = min(desc->Columns, columns); num_columns = desc->Columns;
} }
else else
{ {
num_rows = min(desc->Columns, columns); num_rows = desc->Columns;
num_columns = min(desc->Rows, rows); num_columns = desc->Rows;
} }
registers_per_matrix = (desc->Class == D3DXPC_MATRIX_COLUMNS) ? desc->Columns : desc->Rows; registers_per_matrix = (desc->Class == D3DXPC_MATRIX_COLUMNS) ? desc->Columns : desc->Rows;