From: Henri Verbeet <hverbeet@codeweavers.com>
Date: Thu, 4 Dec 2008 16:41:31 +0000 (+0100)
Subject: wined3d: Remove a redundant condition in shader_get_opcode().
X-Git-Tag: wine-1.1.10~41
X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=af1bc3d9edf6580a90e1d7d4ea3a17e1b487458b;p=wine%2Feterwine.git

wined3d: Remove a redundant condition in shader_get_opcode().
---

diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c
index 1c7c565c32..c9301d53a7 100644
--- a/dlls/wined3d/baseshader.c
+++ b/dlls/wined3d/baseshader.c
@@ -87,9 +87,10 @@ const SHADER_OPCODE* shader_get_opcode(
 
     /** TODO: use dichotomic search */
     while (NULL != shader_ins[i].name) {
-        if (((code & WINED3DSI_OPCODE_MASK) == shader_ins[i].opcode) &&
-            (((hex_version >= shader_ins[i].min_version) && (hex_version <= shader_ins[i].max_version)) ||
-            ((shader_ins[i].min_version == 0) && (shader_ins[i].max_version == 0)))) {
+        if ((code & WINED3DSI_OPCODE_MASK) == shader_ins[i].opcode
+                && hex_version >= shader_ins[i].min_version
+                && (!shader_ins[i].max_version || hex_version <= shader_ins[i].max_version))
+        {
             return &shader_ins[i];
         }
         ++i;