A little more work on MOJOSHADER_glLinkProgram().

Still not complete! --HG-- branch : trunk
icculus · Apr 27, 2008 · 8125e76 · 8125e76
1 parent 6147caf
commit 8125e76
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/mojoshader_opengl.c b/mojoshader_opengl.c
@@ -251,15 +251,23 @@ MOJOSHADER_glProgram *MOJOSHADER_glLinkProgram(MOJOSHADER_glShader *vshader,
 
     // !!! FIXME: alloc retval.
 
-    retval->vertex = vshader;
-    retval->fragment = pshader;
-    retval->handle = program;
-    retval->refcount = 1;
+    retval = (MOJOSHADER_glProgram *) Malloc(sizeof (MOJOSHADER_glProgram));
+    if (retval == NULL)
+        pglDeleteObjectARB(program);
+    else
+    {
+        retval->vertex = vshader;
+        retval->fragment = pshader;
+        retval->handle = program;
+        retval->refcount = 1;
+    } // else
 
     if (vshader != NULL)
         vshader->refcount++;
     if (pshader != NULL)
         pshader->refcount++;
+
+    return retval;
 } // MOJOSHADER_glLinkProgram