From 17b629eeb74e578bcdb5521820798215d9e369e8 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Mon, 30 May 2011 19:34:03 -0400 Subject: [PATCH] Put preshader opcode switch in numeric order. Makes missing values obvious. --- mojoshader.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/mojoshader.c b/mojoshader.c index 1ca68489..05c2a9ee 100644 --- a/mojoshader.c +++ b/mojoshader.c @@ -7261,27 +7261,27 @@ static void parse_preshader(Context *ctx, uint32 tokcount) switch ((opcodetok >> 16) & 0xFFFF) { case 0x1000: opcode = MOJOSHADER_PRESHADEROP_MOV; break; - case 0x3000: opcode = MOJOSHADER_PRESHADEROP_CMP; break; - case 0x5000: opcode = MOJOSHADER_PRESHADEROP_DOT; break; - case 0xD000: opcode = MOJOSHADER_PRESHADEROP_DOT_SCALAR; break; case 0x1010: opcode = MOJOSHADER_PRESHADEROP_NEG; break; - case 0x2010: opcode = MOJOSHADER_PRESHADEROP_MAX; break; - case 0xA010: opcode = MOJOSHADER_PRESHADEROP_MAX_SCALAR; break; - case 0x2020: opcode = MOJOSHADER_PRESHADEROP_CMPLT; break; - case 0xA020: opcode = MOJOSHADER_PRESHADEROP_CMPLT_SCALAR; break; - case 0x2030: opcode = MOJOSHADER_PRESHADEROP_CMPGE; break; - case 0xA030: opcode = MOJOSHADER_PRESHADEROP_CMPGE_SCALAR; break; case 0x1030: opcode = MOJOSHADER_PRESHADEROP_RCP; break; case 0x1040: opcode = MOJOSHADER_PRESHADEROP_FRC; break; case 0x1050: opcode = MOJOSHADER_PRESHADEROP_EXP; break; - case 0x2040: opcode = MOJOSHADER_PRESHADEROP_ADD; break; - case 0xA040: opcode = MOJOSHADER_PRESHADEROP_ADD_SCALAR; break; - case 0x2050: opcode = MOJOSHADER_PRESHADEROP_MUL; break; - case 0xA050: opcode = MOJOSHADER_PRESHADEROP_MUL_SCALAR; break; case 0x1060: opcode = MOJOSHADER_PRESHADEROP_LOG; break; case 0x1070: opcode = MOJOSHADER_PRESHADEROP_RSQ; break; case 0x1080: opcode = MOJOSHADER_PRESHADEROP_SIN; break; case 0x1090: opcode = MOJOSHADER_PRESHADEROP_COS; break; + case 0x2010: opcode = MOJOSHADER_PRESHADEROP_MAX; break; + case 0x2020: opcode = MOJOSHADER_PRESHADEROP_CMPLT; break; + case 0x2030: opcode = MOJOSHADER_PRESHADEROP_CMPGE; break; + case 0x2040: opcode = MOJOSHADER_PRESHADEROP_ADD; break; + case 0x2050: opcode = MOJOSHADER_PRESHADEROP_MUL; break; + case 0x3000: opcode = MOJOSHADER_PRESHADEROP_CMP; break; + case 0x5000: opcode = MOJOSHADER_PRESHADEROP_DOT; 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 0xA040: opcode = MOJOSHADER_PRESHADEROP_ADD_SCALAR; break; + case 0xA050: opcode = MOJOSHADER_PRESHADEROP_MUL_SCALAR; break; + case 0xD000: opcode = MOJOSHADER_PRESHADEROP_DOT_SCALAR; break; default: fail(ctx, "Unknown preshader opcode."); break; } // switch