d3dx9: Clamp register count for D3DXPC_MATRIX_COLUMNS.

ae95176c · Rico Schüller · Alexandre Julliard · e9bd764a · ae95176c
Commit ae95176c authored Sep 18, 2013 by Rico Schüller Committed by Alexandre Julliard Sep 19, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

shader.c dlls/d3dx9_36/shader.c +1 -1

No files found.
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -1137,7 +1137,7 @@ static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, 
            break;

        case D3DXPC_MATRIX_COLUMNS:
-            regcount = desc->Columns;
+            regcount = min(desc->RegisterCount, desc->Columns);
            if (inclass == D3DXPC_MATRIX_ROWS) rin = incol;
            else cin = incol;
            regsize = desc->Rows;