X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_gl2.c;h=9e31502bb916c833f16f1be044dee37bafdf0b13;hb=cadeadc74ba1ce5c9d81bb72f29504a007b28cae;hp=641a8136c43277935eef15361ed036908def111c;hpb=1bf2e32f8b61fa282ba805ff3be13e4589019f1a;p=freeglut diff --git a/src/fg_gl2.c b/src/fg_gl2.c index 641a813..9e31502 100644 --- a/src/fg_gl2.c +++ b/src/fg_gl2.c @@ -39,6 +39,8 @@ void FGAPIENTRY glutSetVertexAttribNormal(GLint attrib) { void fgInitGL2() { fgState.HasOpenGL20 = 0; + // TODO: Mesa returns a valid stub function, rather than NULL, + // when we request a non-existent function #define CHECK(func, a) if ((a) == NULL) { fgWarning("fgInitGL2: " func " is NULL"); return; } CHECK("fghGenBuffers", fghGenBuffers = (FGH_PFNGLGENBUFFERSPROC) glutGetProcAddress ("glGenBuffers")); CHECK("fghDeleteBuffers", fghDeleteBuffers = (FGH_PFNGLDELETEBUFFERSPROC) glutGetProcAddress ("glDeleteBuffers")); @@ -46,7 +48,7 @@ void fgInitGL2() { CHECK("fghBufferData", fghBufferData = (FGH_PFNGLBUFFERDATAPROC) glutGetProcAddress ("glBufferData")); CHECK("fghVertexAttribPointer", fghVertexAttribPointer = (FGH_PFNGLVERTEXATTRIBPOINTERPROC) glutGetProcAddress ("glVertexAttribPointer")); CHECK("fghEnableVertexAttribArray", fghEnableVertexAttribArray = (FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) glutGetProcAddress ("glEnableVertexAttribArray")); - CHECK("fghDisableVertexAttribArray", fghDisableVertexAttribArray = (FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) glutGetProcAddress ("glDisnableVertexAttribArray")); + CHECK("fghDisableVertexAttribArray", fghDisableVertexAttribArray = (FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) glutGetProcAddress ("glDisableVertexAttribArray")); #undef CHECK fgState.HasOpenGL20 = 1; }