d3dx9_36: Simplify conditional expression (PVS-Studio).

Signed-off-by: Frédéric Delanoy <frederic.delanoy@gmail.com> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dx9_36: Simplify conditional expression (PVS-Studio).
3cdea7e5 · Frédéric Delanoy · Alexandre Julliard · 91a4f417 · 3cdea7e5
Commit 3cdea7e5 authored Oct 15, 2015 by Frédéric Delanoy Committed by Alexandre Julliard Oct 16, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -1096,7 +1096,7 @@ static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, 
            offset = min(desc->Elements - 1, offset);
            last = offset * desc->Rows * desc->Columns;

-            if ((is_pointer || (!is_pointer && inclass == D3DXPC_MATRIX_ROWS)) && desc->RegisterSet != D3DXRS_BOOL)
+            if ((is_pointer || inclass == D3DXPC_MATRIX_ROWS) && desc->RegisterSet != D3DXRS_BOOL)
            {
                set(table, device, &constant->constants[0], NULL, intype, size, incol, inclass, 0, is_pointer);
            }
@@ -1136,7 +1136,7 @@ static UINT set(struct ID3DXConstantTableImpl *table, IDirect3DDevice9 *device, 
             * E.g.: struct {int i; int n} s;
             *       SetValue(device, "s", [1, 2], 8) => s = {1, 0};
             */
-            else if ((is_pointer || (!is_pointer && inclass == D3DXPC_MATRIX_ROWS)) && desc->RegisterSet != D3DXRS_BOOL)
+            else if ((is_pointer || inclass == D3DXPC_MATRIX_ROWS) && desc->RegisterSet != D3DXRS_BOOL)
            {
                last = set(table, device, &constant->constants[0], indata, intype, size, incol, inclass,
                        index + last, is_pointer);