Expose mtlShaderState to mojoshader_effects.h

icculus · Apr 3, 2020 · 6f5f991 · 6f5f991
1 parent 9f94041
commit 6f5f991
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/mojoshader_effects.h b/mojoshader_effects.h
@@ -804,7 +804,15 @@ DECLSPEC void MOJOSHADER_glEffectEnd(MOJOSHADER_glEffect *glEffect);
 /* Metal effect interface... */
 
 typedef struct MOJOSHADER_mtlEffect MOJOSHADER_mtlEffect;
-typedef struct MOJOSHADER_mtlShaderState MOJOSHADER_mtlShaderState;
+typedef struct MOJOSHADER_mtlShaderState
+{
+    MOJOSHADER_mtlShader *vertexShader;
+    MOJOSHADER_mtlShader *fragmentShader;
+    void *vertexUniformBuffer; // MTLBuffer*
+    void *fragmentUniformBuffer; // MTLBuffer*
+    int vertexUniformOffset;
+    int fragmentUniformOffset;
+} MOJOSHADER_mtlShaderState;
 
 /* Fully compile/link the shaders found within the effect.
  *

diff --git a/mojoshader_metal.c b/mojoshader_metal.c
@@ -79,16 +79,6 @@ typedef struct MOJOSHADER_mtlUniformBuffer
     int alreadyWritten;
 } MOJOSHADER_mtlUniformBuffer;
 
-typedef struct MOJOSHADER_mtlShaderState
-{
-    MOJOSHADER_mtlShader *vertexShader;
-    MOJOSHADER_mtlShader *fragmentShader;
-    void *vertexUniformBuffer; // MTLBuffer*
-    void *fragmentUniformBuffer; // MTLBuffer*
-    int vertexUniformOffset;
-    int fragmentUniformOffset;
-} MOJOSHADER_mtlShaderState;
-
 /* Objective-C selector references */
 
 static void *classNSString = NULL;