Add getError to effectShaderContext

icculus · Jun 25, 2020 · 62c954f · 62c954f
1 parent 00e7c6b
commit 62c954f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/mojoshader_effects.c b/mojoshader_effects.c
@@ -686,6 +686,12 @@ static void readsmallobjects(const uint32 numsmallobjects,
             object->shader.shader = effect->ctx.compileShader(mainfn, *ptr, length,
                                                               swiz, swizcount,
                                                               smap, smapcount);
+            if (object->shader.shader == NULL)
+            {
+                // Bail ASAP, so we can get the error to the application
+                errorlist_add(errors, NULL, 0, effect->ctx.getError());
+                return;
+            } // if
             pd = effect->ctx.getParseData(object->shader.shader);
             if (pd->error_count > 0)
             {
@@ -816,6 +822,12 @@ static void readlargeobjects(const uint32 numlargeobjects,
                 object->shader.shader = effect->ctx.compileShader(mainfn, *ptr, length,
                                                                   swiz, swizcount,
                                                                   smap, smapcount);
+                if (object->shader.shader == NULL)
+                {
+                    // Bail ASAP, so we can get the error to the application
+                    errorlist_add(errors, NULL, 0, effect->ctx.getError());
+                    return;
+                } // if
                 pd = effect->ctx.getParseData(object->shader.shader);
                 if (pd->error_count > 0)
                 {

diff --git a/mojoshader_effects.h b/mojoshader_effects.h
@@ -506,6 +506,7 @@ typedef void (MOJOSHADERCALL * MOJOSHADER_mapUniformBufferMemoryFunc)(
     float **psf, int **psi, unsigned char **psb
 );
 typedef void (MOJOSHADERCALL * MOJOSHADER_unmapUniformBufferMemoryFunc)();
+typedef const char* (MOJOSHADERCALL * MOJOSHADER_getErrorFunc)();
 
 typedef struct MOJOSHADER_effectShaderContext
 {
@@ -518,6 +519,7 @@ typedef struct MOJOSHADER_effectShaderContext
     MOJOSHADER_getBoundShadersFunc getBoundShaders;
     MOJOSHADER_mapUniformBufferMemoryFunc mapUniformBufferMemory;
     MOJOSHADER_unmapUniformBufferMemoryFunc unmapUniformBufferMemory;
+    MOJOSHADER_getErrorFunc getError;
 
     /* Allocator */
     MOJOSHADER_malloc m;