From 6f5f99165c750c003c8648ee9abcdf859bcb9d04 Mon Sep 17 00:00:00 2001 From: Caleb Cornett Date: Fri, 3 Apr 2020 12:40:20 -0400 Subject: [PATCH] Expose mtlShaderState to mojoshader_effects.h --- mojoshader_effects.h | 10 +++++++++- mojoshader_metal.c | 10 ---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/mojoshader_effects.h b/mojoshader_effects.h index 639c3c39..b012c19a 100644 --- 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 index 1b99f97b..6f0779dd 100644 --- 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;