mojoshader_effects.c
changeset 1186 b5c8483ff647
parent 1185 7ff14b0252a0
child 1204 21422b28cfd4
--- 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