Skip to content

W
wine-cw
Commit f87745d4 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard
Browse files
Options

d3dx9_36: Fix compilation on systems that don't support nameless unions.

parent 39b02829
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
dlls/d3dx9_36/effect.c
View file @ f87745d4
...@@ -18,8 +18,10 @@ ...@@ -18,8 +18,10 @@
#include "config.h" #include "config.h"
#include "wine/port.h" #include "wine/port.h"
#define NONAMELESSUNION
#include "wine/debug.h" #include "wine/debug.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "windef.h" #include "windef.h"
#include "wingdi.h" #include "wingdi.h"
#include "d3dx9_36_private.h" #include "d3dx9_36_private.h"
...@@ -897,9 +899,9 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) ...@@ -897,9 +899,9 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix)
for (k = 0; k < 4; ++k) for (k = 0; k < 4; ++k)
{ {
if ((i < param->rows) && (k < param->columns)) if ((i < param->rows) && (k < param->columns))
matrix->m[i][k] = get_float(param->type, (float *)param->data + i * param->columns + k); matrix->u.m[i][k] = get_float(param->type, (float *)param->data + i * param->columns + k);
else else
matrix->m[i][k] = 0.0f; matrix->u.m[i][k] = 0.0f;
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment