wined3d: Remove a redundant condition in shader_get_opcode().
authorHenri Verbeet <hverbeet@codeweavers.com>
Thu, 4 Dec 2008 16:41:31 +0000 (17:41 +0100)
committerAlexandre Julliard <julliard@winehq.org>
Fri, 5 Dec 2008 10:58:58 +0000 (11:58 +0100)
dlls/wined3d/baseshader.c

index 1c7c565c32507d24ae0716f090af495022b68f2b..c9301d53a7ed096cfaf1fc8cc5cc552de3a54e43 100644 (file)
@@ -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;