Added support for producing shader language source code for Apple's M…

…etal API.
icculus · Apr 25, 2016 · dc12246 · dc12246
1 parent a5e7941
commit dc12246
Show file tree

Hide file tree

Showing 9 changed files with 2,642 additions and 251 deletions.
diff --git a/mojoshader.c b/mojoshader.c
diff --git a/mojoshader.h b/mojoshader.h
@@ -534,6 +534,14 @@ typedef struct MOJOSHADER_parseData
      */
     int minor_ver;
 
+    /*
+     * This is the main function name of the shader. On profiles that need
+     *  the caller to supply this, this will be the caller-supplied string.
+     *  Otherwise, it'll be the name chosen by the profile ("main") or
+     *  whatnot.
+     */
+    const char *mainfn;
+
     /*
      * The number of elements pointed to by (uniforms).
      */
@@ -698,6 +706,11 @@ typedef struct MOJOSHADER_parseData
  */
 #define MOJOSHADER_PROFILE_NV4 "nv4"
 
+/*
+ * Profile string for Metal: Apple's lowlevel API's high-level shader language.
+ */
+#define MOJOSHADER_PROFILE_METAL "metal"
+
 /*
  * Determine the highest supported Shader Model for a profile.
  */
@@ -753,11 +766,18 @@ DECLSPEC int MOJOSHADER_maxShaderModel(const char *profile);
  *  risk a buffer overflow if you have corrupt data, etc. Supply the value
  *  if you can.
  *
+ * You should pass a name for your shader's main function in here, via the
+ *  (mainfn) param. Some profiles need this name to be unique. Passing a NULL
+ *  here will pick a reasonable default, and most profiles will ignore it
+ *  anyhow. As the name of the shader's main function, etc, so make it a
+ *  simple name that would match C's identifier rules. Keep it simple!
+ *
  * This function is thread safe, so long as (m) and (f) are too, and that
  *  (tokenbuf) remains intact for the duration of the call. This allows you
  *  to parse several shaders on separate CPU cores at the same time.
  */
 DECLSPEC const MOJOSHADER_parseData *MOJOSHADER_parse(const char *profile,
+                                                      const char *mainfn,
                                                       const unsigned char *tokenbuf,
                                                       const unsigned int bufsize,
                                                       const MOJOSHADER_swizzle *swiz,

diff --git a/mojoshader_assembler.c b/mojoshader_assembler.c
@@ -1676,7 +1676,7 @@ static const MOJOSHADER_parseData *build_final_assembly(Context *ctx)
     // It also saves us the trouble of duplicating all the other work,
     //  like setting up the uniforms list, etc.
     MOJOSHADER_parseData *retval = (MOJOSHADER_parseData *)
-                            MOJOSHADER_parse(MOJOSHADER_PROFILE_BYTECODE,
+                            MOJOSHADER_parse(MOJOSHADER_PROFILE_BYTECODE, NULL,
                                     bytecode, output_len, NULL, 0, NULL, 0,
                                     ctx->malloc, ctx->free, ctx->malloc_data);
     Free(ctx, bytecode);

diff --git a/mojoshader_effects.c b/mojoshader_effects.c
@@ -745,7 +745,7 @@ static void readlargeobjects(const uint32 numlargeobjects,
             } // if
             else
             {
-                object->shader.shader = MOJOSHADER_parse(emitter, *ptr, length,
+                object->shader.shader = MOJOSHADER_parse(emitter, NULL, *ptr, length,
                                                          swiz, swizcount, smap, smapcount,
                                                          m, f, d);
                 // !!! FIXME: check for errors.

diff --git a/mojoshader_internal.h b/mojoshader_internal.h
@@ -64,6 +64,10 @@
 #define SUPPORT_PROFILE_ARB1_NV 1
 #endif
 
+#ifndef SUPPORT_PROFILE_METAL
+#define SUPPORT_PROFILE_METAL 1
+#endif
+
 #if SUPPORT_PROFILE_ARB1_NV && !SUPPORT_PROFILE_ARB1
 #error nv profiles require arb1 profile. Fix your build.
 #endif

diff --git a/mojoshader_opengl.c b/mojoshader_opengl.c
@@ -1537,8 +1537,11 @@ MOJOSHADER_glShader *MOJOSHADER_glCompileShader(const unsigned char *tokenbuf,
 {
     MOJOSHADER_glShader *retval = NULL;
     GLuint shader = 0;
-    const MOJOSHADER_parseData *pd = MOJOSHADER_parse(ctx->profile, tokenbuf,
-                                                      bufsize, swiz, swizcount,
+
+    // This doesn't need a mainfn, since there's no GL lang that does.
+    const MOJOSHADER_parseData *pd = MOJOSHADER_parse(ctx->profile, NULL,
+                                                      tokenbuf, bufsize,
+                                                      swiz, swizcount,
                                                       smap, smapcount,
                                                       ctx->malloc_fn,
                                                       ctx->free_fn,

diff --git a/utils/finderrors.c b/utils/finderrors.c
@@ -160,7 +160,7 @@ static int do_file(const char *profile, const char *dname, const char *fn, int *
         MOJOSHADER_glDeleteShader(shader);
     }
     #else
-    const MOJOSHADER_parseData *pd = MOJOSHADER_parse(profile, buf, rc, NULL, 0, NULL, 0, NULL, NULL, NULL);
+    const MOJOSHADER_parseData *pd = MOJOSHADER_parse(profile, NULL, buf, rc, NULL, 0, NULL, 0, NULL, NULL, NULL);
     if (pd->error_count == 0)
         report("PASS: %s\n", fname);
 	else

diff --git a/utils/testoutput.c b/utils/testoutput.c
@@ -16,7 +16,7 @@ static int do_parse(const unsigned char *buf, const int len, const char *prof)
     const MOJOSHADER_parseData *pd;
     int retval = 0;
 
-    pd = MOJOSHADER_parse(prof, buf, len, NULL, 0, NULL, 0, NULL, NULL, NULL);
+    pd = MOJOSHADER_parse(prof, NULL, buf, len, NULL, 0, NULL, 0, NULL, NULL, NULL);
     if (pd->error_count > 0)
     {
         int i;

diff --git a/utils/testparse.c b/utils/testparse.c
@@ -688,7 +688,7 @@ static int do_parse(const char *fname, const unsigned char *buf,
     else  // do it as a regular compiled shader.
     {
         const MOJOSHADER_parseData *pd;
-        pd = MOJOSHADER_parse(prof, buf, len, NULL, 0,
+        pd = MOJOSHADER_parse(prof, NULL, buf, len, NULL, 0,
                               NULL, 0, Malloc, Free, NULL);
         retval = (pd->error_count == 0);
         printf("SHADER: %s\n", fname);