From 11d921a221be63f02a3c66059044fbe8ba14fe1a Mon Sep 17 00:00:00 2001 From: Ethan Lee Date: Thu, 17 May 2018 12:16:22 -0400 Subject: [PATCH] Read SYMTYPE_TEXTURE* large objs and read their names (thanks Maik!) --- mojoshader_effects.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mojoshader_effects.c b/mojoshader_effects.c index fb6a6216..2aa37207 100644 --- a/mojoshader_effects.c +++ b/mojoshader_effects.c @@ -622,11 +622,8 @@ static void readsmallobjects(const uint32 numsmallobjects, || 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 @@ static void readlargeobjects(const uint32 numlargeobjects, } // 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