Mercurial Mercurial > icculus > mojoshader / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed CMPLT and CMPGE to LT and GE, to match what fxc spits out.
authorRyan C. Gordon <icculus@icculus.org>
Tue, 31 May 2011 01:09:12 -0400
changeset 1035 5855d767e4b2
parent 1034 549f160533fa
child 1036 8a3597b44ff7
Changed CMPLT and CMPGE to LT and GE, to match what fxc spits out.
mojoshader.c file | annotate | diff | comparison | revisions
mojoshader.h file | annotate | diff | comparison | revisions 
--- a/mojoshader.c	Tue May 31 00:56:00 2011 -0400
+++ b/mojoshader.c	Tue May 31 01:09:12 2011 -0400
@@ -7274,8 +7274,8 @@
             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 @@
             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;
--- a/mojoshader.h	Tue May 31 00:56:00 2011 -0400
+++ b/mojoshader.h	Tue May 31 01:09:12 2011 -0400
@@ -372,8 +372,8 @@
     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 @@
     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,
icculus/mojoshader