unhack framebuffer functions a little
This commit is contained in:
1 parent
e77e7d1643
commit
60cffe1ed1
1 file changed
+37
-57
@@ -114,7 +114,8 @@ static GLfloat modelMatrix[16];
|
||||
static GLfloat projMatrix[16];
|
||||
static GLint viewport[4];
|
||||
|
||||
static boolean gl_framebuffer_init(void);
|
||||
static boolean GLFramebuffer_IsFuncAvailible(void);
|
||||
|
||||
|
||||
GLuint FramebufferObject, FramebufferTexture, RenderbufferObject;
|
||||
GLboolean FrameBufferEnabled = GL_FALSE, RenderToFramebuffer = GL_FALSE;
|
||||
@@ -313,18 +314,6 @@ static void GL_MSG_Error(const char *format, ...)
|
||||
#define pglCopyTexImage2D glCopyTexImage2D
|
||||
#define pglCopyTexSubImage2D glCopyTexSubImage2D
|
||||
|
||||
/* 3.0 functions for framebuffers and renderbuffers */
|
||||
#define pglGenFramebuffers glGenFramebuffers
|
||||
#define pglBindFramebuffer glBindFramebuffer
|
||||
#define pglDeleteFramebuffers glDeleteFramebuffers
|
||||
#define pglFramebufferTexture2D glFramebufferTexture2D
|
||||
#define pglCheckFramebufferStatus glCheckFramebufferStatus
|
||||
#define pglGenRenderbuffers glGenRenderbuffers
|
||||
#define pglBindRenderbuffer glBindRenderbuffer
|
||||
#define pglDeleteRenderbuffers glDeleteRenderbuffers
|
||||
#define pglRenderbufferStorage glRenderbufferStorage
|
||||
#define pglFramebufferRenderbuffer glFramebufferRenderbuffer
|
||||
|
||||
#else //!STATIC_OPENGL
|
||||
|
||||
/* 1.0 functions */
|
||||
@@ -449,37 +438,25 @@ static PFNglGenerateMipmap pglGenerateMipmap;
|
||||
|
||||
/* 3.0 functions for framebuffers and renderbuffers */
|
||||
typedef void (APIENTRY * PFNglGenFramebuffers) (GLsizei n, GLuint *ids);
|
||||
extern PFNglGenFramebuffers pglGenFramebuffers;
|
||||
static PFNglGenFramebuffers pglGenFramebuffers;
|
||||
typedef void (APIENTRY * PFNglBindFramebuffer) (GLenum target, GLuint framebuffer);
|
||||
extern PFNglBindFramebuffer pglBindFramebuffer;
|
||||
static PFNglBindFramebuffer pglBindFramebuffer;
|
||||
typedef void (APIENTRY * PFNglDeleteFramebuffers) (GLsizei n, GLuint *ids);
|
||||
extern PFNglDeleteFramebuffers pglDeleteFramebuffers;
|
||||
static PFNglDeleteFramebuffers pglDeleteFramebuffers;
|
||||
typedef void (APIENTRY * PFNglFramebufferTexture2D) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
|
||||
extern PFNglFramebufferTexture2D pglFramebufferTexture2D;
|
||||
static PFNglFramebufferTexture2D pglFramebufferTexture2D;
|
||||
typedef GLenum (APIENTRY * PFNglCheckFramebufferStatus) (GLenum target);
|
||||
extern PFNglCheckFramebufferStatus pglCheckFramebufferStatus;
|
||||
static PFNglCheckFramebufferStatus pglCheckFramebufferStatus;
|
||||
typedef void (APIENTRY * PFNglGenRenderbuffers) (GLsizei n, GLuint *renderbuffers);
|
||||
extern PFNglGenRenderbuffers pglGenRenderbuffers;
|
||||
static PFNglGenRenderbuffers pglGenRenderbuffers;
|
||||
typedef void (APIENTRY * PFNglBindRenderbuffer) (GLenum target, GLuint renderbuffer);
|
||||
extern PFNglBindRenderbuffer pglBindRenderbuffer;
|
||||
static PFNglBindRenderbuffer pglBindRenderbuffer;
|
||||
typedef void (APIENTRY * PFNglDeleteRenderbuffers) (GLsizei n, GLuint *renderbuffers);
|
||||
extern PFNglDeleteRenderbuffers pglDeleteRenderbuffers;
|
||||
static PFNglDeleteRenderbuffers pglDeleteRenderbuffers;
|
||||
typedef void (APIENTRY * PFNglRenderbufferStorage) (GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
|
||||
extern PFNglRenderbufferStorage pglRenderbufferStorage;
|
||||
static PFNglRenderbufferStorage pglRenderbufferStorage;
|
||||
typedef void (APIENTRY * PFNglFramebufferRenderbuffer) (GLenum target, GLenum attachment, GLenum renderbuffertarget, GLenum renderbuffer);
|
||||
extern PFNglFramebufferRenderbuffer pglFramebufferRenderbuffer;
|
||||
|
||||
/* 3.0 functions for framebuffers and renderbuffers */
|
||||
PFNglGenFramebuffers pglGenFramebuffers;
|
||||
PFNglBindFramebuffer pglBindFramebuffer;
|
||||
PFNglDeleteFramebuffers pglDeleteFramebuffers;
|
||||
PFNglFramebufferTexture2D pglFramebufferTexture2D;
|
||||
PFNglCheckFramebufferStatus pglCheckFramebufferStatus;
|
||||
PFNglGenRenderbuffers pglGenRenderbuffers;
|
||||
PFNglBindRenderbuffer pglBindRenderbuffer;
|
||||
PFNglDeleteRenderbuffers pglDeleteRenderbuffers;
|
||||
PFNglRenderbufferStorage pglRenderbufferStorage;
|
||||
PFNglFramebufferRenderbuffer pglFramebufferRenderbuffer;
|
||||
static PFNglFramebufferRenderbuffer pglFramebufferRenderbuffer;
|
||||
#endif
|
||||
|
||||
/* 1.2 functions for 3D textures */
|
||||
@@ -766,31 +743,34 @@ void SetupGLFunc4(void)
|
||||
pglGetUniformLocation = GetGLFunc("glGetUniformLocation");
|
||||
|
||||
pglGenerateMipmap = GetGLFunc("glGenerateMipmap");
|
||||
|
||||
pglGenFramebuffers = GetGLFunc("glGenFramebuffers");
|
||||
pglBindFramebuffer = GetGLFunc("glBindFramebuffer");
|
||||
pglDeleteFramebuffers = GetGLFunc("glDeleteFramebuffers");
|
||||
pglFramebufferTexture2D = GetGLFunc("glFramebufferTexture2D");
|
||||
pglCheckFramebufferStatus = GetGLFunc("glCheckFramebufferStatus");
|
||||
pglGenRenderbuffers = GetGLFunc("glGenRenderbuffers");
|
||||
pglBindRenderbuffer = GetGLFunc("glBindRenderbuffer");
|
||||
pglDeleteRenderbuffers = GetGLFunc("glDeleteRenderbuffers");
|
||||
pglRenderbufferStorage = GetGLFunc("glRenderbufferStorage");
|
||||
pglFramebufferRenderbuffer = GetGLFunc("glFramebufferRenderbuffer");
|
||||
|
||||
if (GLFramebuffer_IsFuncAvailible())
|
||||
{
|
||||
pglGenFramebuffers = GetGLFunc("glGenFramebuffers");
|
||||
pglBindFramebuffer = GetGLFunc("glBindFramebuffer");
|
||||
pglDeleteFramebuffers = GetGLFunc("glDeleteFramebuffers");
|
||||
pglFramebufferTexture2D = GetGLFunc("glFramebufferTexture2D");
|
||||
pglCheckFramebufferStatus = GetGLFunc("glCheckFramebufferStatus");
|
||||
pglGenRenderbuffers = GetGLFunc("glGenRenderbuffers");
|
||||
pglBindRenderbuffer = GetGLFunc("glBindRenderbuffer");
|
||||
pglDeleteRenderbuffers = GetGLFunc("glDeleteRenderbuffers");
|
||||
pglRenderbufferStorage = GetGLFunc("glRenderbufferStorage");
|
||||
pglFramebufferRenderbuffer = GetGLFunc("glFramebufferRenderbuffer");
|
||||
}
|
||||
}
|
||||
|
||||
static boolean gl_framebuffer_init(void)
|
||||
static boolean GLFramebuffer_IsFuncAvailible(void)
|
||||
{
|
||||
return (pglGenFramebuffers && pglBindFramebuffer && pglDeleteFramebuffers && pglFramebufferTexture2D && pglCheckFramebufferStatus &&
|
||||
pglGenRenderbuffers && pglBindRenderbuffer && pglDeleteRenderbuffers && pglRenderbufferStorage && pglFramebufferRenderbuffer);
|
||||
return((isExtAvailable("GL_ARB_framebuffer_no_attachments",gl_extensions)) &&
|
||||
(isExtAvailable("GL_ARB_framebuffer_object",gl_extensions)) &&
|
||||
(isExtAvailable("GL_ARB_framebuffer_sRGB",gl_extensions)));
|
||||
}
|
||||
|
||||
|
||||
EXPORT boolean HWRAPI(InitShaders) (void)
|
||||
{
|
||||
if (!pglUseProgram)
|
||||
return false;
|
||||
|
||||
|
||||
gl_fallback_shader.vertex_shader = Z_StrDup(GLSL_FALLBACK_VERTEX_SHADER);
|
||||
gl_fallback_shader.fragment_shader = Z_StrDup(GLSL_FALLBACK_FRAGMENT_SHADER);
|
||||
|
||||
@@ -1012,7 +992,7 @@ void SetStates(void)
|
||||
|
||||
void GLFramebuffer_Generate(void)
|
||||
{
|
||||
if (!gl_framebuffer_init())
|
||||
if (!GLFramebuffer_IsFuncAvailible())
|
||||
return;
|
||||
|
||||
// Generate the framebuffer
|
||||
@@ -1025,7 +1005,7 @@ void GLFramebuffer_Generate(void)
|
||||
|
||||
void GLFramebuffer_Delete(void)
|
||||
{
|
||||
if (!gl_framebuffer_init())
|
||||
if (!GLFramebuffer_IsFuncAvailible())
|
||||
return;
|
||||
|
||||
// Unbind the framebuffer
|
||||
@@ -1040,7 +1020,7 @@ void GLFramebuffer_Delete(void)
|
||||
|
||||
void GLFramebuffer_GenerateAttachments(void)
|
||||
{
|
||||
if (!gl_framebuffer_init())
|
||||
if (!GLFramebuffer_IsFuncAvailible())
|
||||
return;
|
||||
|
||||
// Bind the framebuffer
|
||||
@@ -1081,7 +1061,7 @@ void GLFramebuffer_GenerateAttachments(void)
|
||||
|
||||
void GLFramebuffer_DeleteAttachments(void)
|
||||
{
|
||||
if (!gl_framebuffer_init())
|
||||
if (!GLFramebuffer_IsFuncAvailible())
|
||||
return;
|
||||
|
||||
// Unbind the framebuffer
|
||||
@@ -1099,7 +1079,7 @@ void GLFramebuffer_DeleteAttachments(void)
|
||||
|
||||
void GLFramebuffer_Enable(void)
|
||||
{
|
||||
if (!gl_framebuffer_init())
|
||||
if (!GLFramebuffer_IsFuncAvailible())
|
||||
return;
|
||||
|
||||
if (FramebufferObject == 0)
|
||||
@@ -1113,7 +1093,7 @@ void GLFramebuffer_Enable(void)
|
||||
|
||||
void GLFramebuffer_Disable(void)
|
||||
{
|
||||
if (!gl_framebuffer_init())
|
||||
if (!GLFramebuffer_IsFuncAvailible())
|
||||
return;
|
||||
|
||||
pglBindFramebuffer(GL_FRAMEBUFFER, 0);
|
||||
|
||||
Reference in new issue
Block a user