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.
Read SYMTYPE_TEXTURE* large objs and read their names (thanks Maik!)
authorEthan Lee <flibitijibibo@flibitijibibo.com>
Thu, 17 May 2018 12:16:22 -0400
changeset 1186 b5c8483ff647
parent 1185 7ff14b0252a0
child 1187 0687a8d78a54
Read SYMTYPE_TEXTURE* large objs and read their names (thanks Maik!)
mojoshader_effects.c file | annotate | diff | comparison | revisions 
--- a/mojoshader_effects.c	Thu May 17 12:15:26 2018 -0400
+++ b/mojoshader_effects.c	Thu May 17 12:16:22 2018 -0400
@@ -622,11 +622,8 @@
               || object->type == MOJOSHADER_SYMTYPE_TEXTURE1D
               || object->type == MOJOSHADER_SYMTYPE_TEXTURE2D
               || object->type == MOJOSHADER_SYMTYPE_TEXTURE3D
-              || object->type == MOJOSHADER_SYMTYPE_TEXTURECUBE)
-        {
-            // No-op. Why is this even here?
-        } // else if
-        else if (object->type == MOJOSHADER_SYMTYPE_SAMPLER
+              || object->type == MOJOSHADER_SYMTYPE_TEXTURECUBE
+              || object->type == MOJOSHADER_SYMTYPE_SAMPLER
               || object->type == MOJOSHADER_SYMTYPE_SAMPLER1D
               || object->type == MOJOSHADER_SYMTYPE_SAMPLER2D
               || object->type == MOJOSHADER_SYMTYPE_SAMPLER3D
@@ -807,7 +804,12 @@
                 } // if
             }
         } // if
-        else if (object->type == MOJOSHADER_SYMTYPE_SAMPLER
+        else if (object->type == MOJOSHADER_SYMTYPE_TEXTURE
+              || object->type == MOJOSHADER_SYMTYPE_TEXTURE1D
+              || object->type == MOJOSHADER_SYMTYPE_TEXTURE2D
+              || object->type == MOJOSHADER_SYMTYPE_TEXTURE3D
+              || object->type == MOJOSHADER_SYMTYPE_TEXTURECUBE
+              || object->type == MOJOSHADER_SYMTYPE_SAMPLER
               || object->type == MOJOSHADER_SYMTYPE_SAMPLER1D
               || object->type == MOJOSHADER_SYMTYPE_SAMPLER2D
               || object->type == MOJOSHADER_SYMTYPE_SAMPLER3D
icculus/mojoshader