Module: wine Branch: master Commit: af1bc3d9edf6580a90e1d7d4ea3a17e1b487458b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af1bc3d9edf6580a90e1d7d4ea...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Dec 4 17:41:31 2008 +0100
wined3d: Remove a redundant condition in shader_get_opcode().
---
dlls/wined3d/baseshader.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 1c7c565..c9301d5 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;