From 8c212886a554d800a5de5c4f54d75e500987e4e4 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Tue, 31 May 2011 01:09:12 -0400 Subject: [PATCH] Changed CMPLT and CMPGE to LT and GE, to match what fxc spits out. --- mojoshader.c | 8 ++++---- mojoshader.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mojoshader.c b/mojoshader.c index bddf82b1..7c4c910b 100644 --- a/mojoshader.c +++ b/mojoshader.c @@ -7274,8 +7274,8 @@ static void parse_preshader(Context *ctx, uint32 tokcount) case 0x10C0: opcode = MOJOSHADER_PRESHADEROP_ATAN; break; case 0x2000: opcode = MOJOSHADER_PRESHADEROP_MIN; break; case 0x2010: opcode = MOJOSHADER_PRESHADEROP_MAX; break; - case 0x2020: opcode = MOJOSHADER_PRESHADEROP_CMPLT; break; - case 0x2030: opcode = MOJOSHADER_PRESHADEROP_CMPGE; break; + case 0x2020: opcode = MOJOSHADER_PRESHADEROP_LT; break; + case 0x2030: opcode = MOJOSHADER_PRESHADEROP_GE; break; case 0x2040: opcode = MOJOSHADER_PRESHADEROP_ADD; break; case 0x2050: opcode = MOJOSHADER_PRESHADEROP_MUL; break; case 0x2060: opcode = MOJOSHADER_PRESHADEROP_ATAN2; break; @@ -7286,8 +7286,8 @@ static void parse_preshader(Context *ctx, uint32 tokcount) case 0x5020: opcode = MOJOSHADER_PRESHADEROP_NOISE; break; case 0xA000: opcode = MOJOSHADER_PRESHADEROP_MIN_SCALAR; break; case 0xA010: opcode = MOJOSHADER_PRESHADEROP_MAX_SCALAR; break; - case 0xA020: opcode = MOJOSHADER_PRESHADEROP_CMPLT_SCALAR; break; - case 0xA030: opcode = MOJOSHADER_PRESHADEROP_CMPGE_SCALAR; break; + case 0xA020: opcode = MOJOSHADER_PRESHADEROP_LT_SCALAR; break; + case 0xA030: opcode = MOJOSHADER_PRESHADEROP_GE_SCALAR; break; case 0xA040: opcode = MOJOSHADER_PRESHADEROP_ADD_SCALAR; break; case 0xA050: opcode = MOJOSHADER_PRESHADEROP_MUL_SCALAR; break; case 0xA060: opcode = MOJOSHADER_PRESHADEROP_ATAN2_SCALAR; break; diff --git a/mojoshader.h b/mojoshader.h index 5526af84..f0707e57 100644 --- a/mojoshader.h +++ b/mojoshader.h @@ -372,8 +372,8 @@ typedef enum MOJOSHADER_preshaderOpcode MOJOSHADER_PRESHADEROP_ATAN, MOJOSHADER_PRESHADEROP_MIN, MOJOSHADER_PRESHADEROP_MAX, - MOJOSHADER_PRESHADEROP_CMPLT, - MOJOSHADER_PRESHADEROP_CMPGE, + MOJOSHADER_PRESHADEROP_LT, + MOJOSHADER_PRESHADEROP_GE, MOJOSHADER_PRESHADEROP_ADD, MOJOSHADER_PRESHADEROP_MUL, MOJOSHADER_PRESHADEROP_ATAN2, @@ -385,8 +385,8 @@ typedef enum MOJOSHADER_preshaderOpcode MOJOSHADER_PRESHADEROP_SCALAR_OPS, MOJOSHADER_PRESHADEROP_MIN_SCALAR = MOJOSHADER_PRESHADEROP_SCALAR_OPS, MOJOSHADER_PRESHADEROP_MAX_SCALAR, - MOJOSHADER_PRESHADEROP_CMPLT_SCALAR, - MOJOSHADER_PRESHADEROP_CMPGE_SCALAR, + MOJOSHADER_PRESHADEROP_LT_SCALAR, + MOJOSHADER_PRESHADEROP_GE_SCALAR, MOJOSHADER_PRESHADEROP_ADD_SCALAR, MOJOSHADER_PRESHADEROP_MUL_SCALAR, MOJOSHADER_PRESHADEROP_ATAN2_SCALAR,