From 8125e76ac77638b87060f402bd1f4d80c42eeb4e Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Sun, 27 Apr 2008 01:22:06 -0400 Subject: [PATCH] A little more work on MOJOSHADER_glLinkProgram(). Still not complete! --HG-- branch : trunk --- mojoshader_opengl.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mojoshader_opengl.c b/mojoshader_opengl.c index c98ed5d8..baccbaa2 100644 --- 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