Skip to content

Commit

Permalink
OpenGL: Start to standardise some our defines and function names.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Kendall committed Feb 7, 2011
1 parent 3678b7d commit 92e22c3
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 42 deletions.
36 changes: 18 additions & 18 deletions mythtv/libs/libmythui/mythrender_opengl.cpp
View file
Expand Up @@ -664,57 +664,57 @@ bool MythRenderOpenGL::CreateFrameBuffer(uint &fb, uint tex)
glPushAttrib(GL_VIEWPORT_BIT);
glViewport(0, 0, size.width(), size.height());
m_glGenFramebuffersEXT(1, &glfb);
m_glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, glfb);
m_glBindFramebufferEXT(GL_FRAMEBUFFER, glfb);
glBindTexture(m_textures[tex].m_type, tex);
glTexImage2D(m_textures[tex].m_type, 0, m_textures[tex].m_internal_fmt,
(GLint) size.width(), (GLint) size.height(), 0,
m_textures[tex].m_data_fmt, m_textures[tex].m_data_type, NULL);
m_glFramebufferTexture2DEXT(
GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
m_textures[tex].m_type, tex, 0);

GLenum status;
status = m_glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
m_glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
status = m_glCheckFramebufferStatusEXT(GL_FRAMEBUFFER);
m_glBindFramebufferEXT(GL_FRAMEBUFFER, 0);
glPopAttrib();

bool success = false;
switch (status)
{
case GL_FRAMEBUFFER_COMPLETE_EXT:
case GL_FRAMEBUFFER_COMPLETE:
VERBOSE(VB_PLAYBACK, LOC +
QString("Created frame buffer object (%1x%2).")
.arg(size.width()).arg(size.height()));
success = true;
break;
case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT:
case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
VERBOSE(VB_PLAYBACK, LOC + "Frame buffer incomplete_ATTACHMENT");
break;
case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT:
case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
VERBOSE(VB_PLAYBACK, LOC +
"Frame buffer incomplete_MISSING_ATTACHMENT");
break;
case GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT:
case GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT:
VERBOSE(VB_PLAYBACK, LOC +
"Frame buffer incomplete_DUPLICATE_ATTACHMENT");
break;
case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT:
case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
VERBOSE(VB_PLAYBACK, LOC +
"Frame buffer incomplete_DIMENSIONS_EXT");
"Frame buffer incomplete_DIMENSIONS");
break;
case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT:
case GL_FRAMEBUFFER_INCOMPLETE_FORMATS:
VERBOSE(VB_PLAYBACK, LOC +
"Frame buffer incomplete_FORMATS_EXT");
"Frame buffer incomplete_FORMATS");
break;
case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT:
case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
VERBOSE(VB_PLAYBACK, LOC +
"Frame buffer incomplete_DRAW_BUFFER_EXT");
"Frame buffer incomplete_DRAW_BUFFER");
break;
case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT:
case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
VERBOSE(VB_PLAYBACK, LOC +
"Frame buffer incomplete_READ_BUFFER_EXT");
"Frame buffer incomplete_READ_BUFFER");
break;
case GL_FRAMEBUFFER_UNSUPPORTED_EXT:
case GL_FRAMEBUFFER_UNSUPPORTED:
VERBOSE(VB_PLAYBACK, LOC + "Frame buffer unsupported.");
break;
default:
Expand Down Expand Up @@ -764,7 +764,7 @@ void MythRenderOpenGL::BindFramebuffer(uint fb)
return;

makeCurrent();
m_glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb);
m_glBindFramebufferEXT(GL_FRAMEBUFFER, fb);
doneCurrent();
m_active_fb = fb;
}
Expand Down
47 changes: 23 additions & 24 deletions mythtv/libs/libmythui/mythrender_opengl_defs.h
View file
Expand Up @@ -17,43 +17,42 @@
#define GL_TEXTURE_RECTANGLE_NV 0x84F5
#endif

#ifndef GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT
#define GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT 0x8CD8
#endif

#ifndef GL_FRAGMENT_PROGRAM_ARB
#define GL_FRAGMENT_PROGRAM_ARB 0x8804
#endif

#ifndef GL_FRAMEBUFFER_EXT
#define GL_FRAMEBUFFER_EXT 0x8D40
#ifndef GL_FRAMEBUFFER
#define GL_FRAMEBUFFER 0x8D40
#endif
#ifndef GL_COLOR_ATTACHMENT0
#define GL_COLOR_ATTACHMENT0 0x8CE0
#endif
#ifndef GL_COLOR_ATTACHMENT0_EXT
#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0
#ifndef GL_FRAMEBUFFER_COMPLETE
#define GL_FRAMEBUFFER_COMPLETE 0x8CD5
#endif
#ifndef GL_FRAMEBUFFER_COMPLETE_EXT
#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5
#ifndef GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT
#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6
#endif
#ifndef GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT
#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6
#ifndef GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT
#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7
#endif
#ifndef GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT
#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7
#ifndef GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT
#define GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT 0x8CD8
#endif
#ifndef GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT
#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9
#ifndef GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS
#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9
#endif
#ifndef GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT
#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA
#ifndef GL_FRAMEBUFFER_INCOMPLETE_FORMATS
#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS 0x8CDA
#endif
#ifndef GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT
#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB
#ifndef GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER
#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB
#endif
#ifndef GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT
#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC
#ifndef GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER
#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC
#endif
#ifndef GL_FRAMEBUFFER_UNSUPPORTED_EXT
#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD
#ifndef GL_FRAMEBUFFER_UNSUPPORTED
#define GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD
#endif

#ifndef GL_MAX_TEXTURE_UNITS
Expand Down

0 comments on commit 92e22c3

Please sign in to comment.