diff --git a/projects/apis/metal/src/shader_module/metal_shader_compiler.h b/projects/apis/metal/src/shader_module/metal_shader_compiler.h index e99ee31..b23f45b 100644 --- a/projects/apis/metal/src/shader_module/metal_shader_compiler.h +++ b/projects/apis/metal/src/shader_module/metal_shader_compiler.h @@ -1,14 +1,9 @@ #pragma once #include "stdint.h" #include "utils/gryphn_bool.h" +#include "utils/gryphn_cpp_function.h" #include -#ifdef __cplusplus -#define GN_CPP_FUNCTION extern "C" -#else -#define GN_CPP_FUNCTION -#endif - #define MAX_METAL_SETS 32 #define MAX_METAL_BINDINGS 16 @@ -30,33 +25,3 @@ typedef struct mtlCompilerInfo { GN_CPP_FUNCTION mtlCompiler mtlCreateCompiler(mtlCompilerInfo* info); GN_CPP_FUNCTION const char* mtlCompilerShader(mtlCompiler compiler, gnUniformLayout* uniformLayout); - -// typedef struct mtlShaderOptions { -// gnBool useArgumentBuffers; -// mtlShaderModuleStage stage; -// const char* entryPoint; -// } mtlShaderOptions; - -// typedef struct mtlBinding { -// uint32_t spvBinding; -// uint32_t metalID; -// } mtlBinding; - -// typedef struct mtlSetMap { -// uint32_t setIndex, mtlSetIndex; -// mtlBinding bindings[MAX_METAL_BINDINGS]; -// } mtlSetMap; - -// typedef struct mtlShaderMap { -// mtlSetMap sets[MAX_METAL_SETS]; -// } mtlShaderMap; - -// typedef struct mtlShader { -// const char* code; -// mtlShaderMap map; -// } mtlShader; - -// #ifdef __cplusplus -// extern "C" -// #endif -// mtlShader mtlCompileShader(uint32_t* code, size_t wordCount, mtlShaderOptions* options); diff --git a/projects/utils b/projects/utils index ba67d03..f364660 160000 --- a/projects/utils +++ b/projects/utils @@ -1 +1 @@ -Subproject commit ba67d0366da48e3bcb3879f4e119135d2272deb8 +Subproject commit f3646609c123be86b778dc143ce3b0c06395baf9