Rico Schüller : d3dx9: Clamp register count for D3DXPC_MATRIX_COLUMNS.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ae95176c0d41cc1161cdfbf36325829ed33fc439
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ae95176c0d41cc1161cdfbf363...

Author: Rico Schüller <kgbricola(a)web.de>
Date:   Wed Sep 18 23:16:33 2013 +0200

d3dx9: Clamp register count for D3DXPC_MATRIX_COLUMNS.

---

 dlls/d3dx9_36/shader.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index 08c5aad..2ff967c 100644
--- 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;