conflict fix
This commit is contained in:
1 parent
137828d224
commit
3d0b3e9471
1 file changed
+1
-6
@@ -501,12 +501,6 @@ typedef void (APIENTRY * PFNglRenderbufferStorageEXT) (GLenum target, GLenum int
|
||||
static PFNglRenderbufferStorageEXT pglRenderbufferStorageEXT;
|
||||
typedef void (APIENTRY * PFNglFramebufferRenderbufferEXT) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLenum renderbuffer);
|
||||
static PFNglFramebufferRenderbufferEXT pglFramebufferRenderbufferEXT;
|
||||
|
||||
/* 3.0 functions for framebuffer stuff*/
|
||||
typedef void (APIENTRY * PFNglBlitFramebuffer) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
|
||||
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
|
||||
GLbitfield mask, GLenum filter);
|
||||
static PFNglBlitFramebuffer pglBlitFramebuffer;
|
||||
#endif // USE_FBO_OGL
|
||||
|
||||
#endif //!STATIC_OPENGL
|
||||
@@ -915,6 +909,7 @@ void SetupGLFunc4(void)
|
||||
GetGLfunc(glRenderbufferStorage);
|
||||
GetGLfunc(glFramebufferRenderbuffer);
|
||||
|
||||
GL_DBG_Printf("\nFBO: ARB extensions found\n");
|
||||
}
|
||||
else if (fbocheck == FBO_EXT || fbocheck == FBO_EXT_STENCIL) // uh oh only support for EXT prefix fbos...
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user