Don't create unnecessary attributes.

Pixel shaders and no-item lists shouldn't call Malloc(). --HG-- branch : trunk
icculus · Apr 19, 2008 · e888921 · e888921
1 parent b6b3fe9
commit e888921
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/mojoshader.c b/mojoshader.c
@@ -4233,6 +4233,16 @@ static MOJOSHADER_uniform *build_uniforms(Context *ctx)
 
 static MOJOSHADER_attribute *build_attributes(Context *ctx)
 {
+    if (ctx->shader_type == MOJOSHADER_TYPE_PIXEL)
+    {
+        if (ctx->attribute_count > 0)
+            fail(ctx, "BUG: pixel shader shouldn't have vertex attributes");
+        return NULL;  // nothing to do for pixel shaders.
+    } // if
+
+    if (ctx->attribute_count == 0)
+        return NULL;  // nothing to do.
+
     MOJOSHADER_attribute *retval = (MOJOSHADER_attribute *)
              Malloc(ctx, sizeof (MOJOSHADER_attribute) * ctx->attribute_count);
 

diff --git a/mojoshader.h b/mojoshader.h
@@ -170,10 +170,10 @@ typedef struct
     /*
      * (uniform_count) elements of data that specify Uniforms to be set for
      *  this shader. See discussion on MOJOSHADER_uniform for details.
+     * This can be NULL on error or if (uniform_count) is zero.
      */
     MOJOSHADER_uniform *uniforms;
 
-
     /*
      * The number of elements pointed to by (attributes).
      */
@@ -182,6 +182,7 @@ typedef struct
     /*
      * (attribute_count) elements of data that specify Attributes to be set
      *  for this shader. See discussion on MOJOSHADER_attribute for details.
+     * This can be NULL on error or if (attribute_count) is zero.
      */
     MOJOSHADER_attribute *attributes;