From 1d6b0171dac1914fe38f4777ae0588853de4e772 Mon Sep 17 00:00:00 2001 From: rachytski Date: Mon, 28 Nov 2011 22:08:12 +0400 Subject: [PATCH] moved opengl constants from the common opengl.cpp file into platform-dependent opengl_ext.cpp and opengl_win32.cpp --- yg/internal/opengl.cpp | 18 ------------------ yg/internal/opengl_ext.cpp | 18 ++++++++++++++++++ yg/internal/opengl_win32.cpp | 18 ++++++++++++++++++ 3 files changed, 36 insertions(+), 18 deletions(-) diff --git a/yg/internal/opengl.cpp b/yg/internal/opengl.cpp index 2d391f83f6..6f23e2f327 100644 --- a/yg/internal/opengl.cpp +++ b/yg/internal/opengl.cpp @@ -14,24 +14,6 @@ namespace yg { namespace gl { - const int GL_FRAMEBUFFER_BINDING_MWM = GL_FRAMEBUFFER_BINDING_EXT; - const int GL_FRAMEBUFFER_MWM = GL_FRAMEBUFFER_EXT; - const int GL_FRAMEBUFFER_UNSUPPORTED_MWM = GL_FRAMEBUFFER_UNSUPPORTED_EXT; - const int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_MWM = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT; - const int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_MWM = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT; - const int GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_MWM = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT; - const int GL_FRAMEBUFFER_COMPLETE_MWM = GL_FRAMEBUFFER_COMPLETE_EXT; - - const int GL_DEPTH_ATTACHMENT_MWM = GL_DEPTH_ATTACHMENT_EXT; - const int GL_COLOR_ATTACHMENT0_MWM = GL_COLOR_ATTACHMENT0_EXT; - const int GL_RENDERBUFFER_MWM = GL_RENDERBUFFER_EXT; - const int GL_RENDERBUFFER_BINDING_MWM = GL_RENDERBUFFER_BINDING_EXT; - const int GL_DEPTH_COMPONENT16_MWM = GL_DEPTH_COMPONENT16; - const int GL_DEPTH_COMPONENT24_MWM = GL_DEPTH_COMPONENT24; - const int GL_RGBA8_MWM = GL_RGBA8; - - const int GL_WRITE_ONLY_MWM = GL_WRITE_ONLY; - platform_unsupported::platform_unsupported(char const * reason) : m_reason(reason) {} diff --git a/yg/internal/opengl_ext.cpp b/yg/internal/opengl_ext.cpp index 04a6c41e3d..f66ffce0db 100644 --- a/yg/internal/opengl_ext.cpp +++ b/yg/internal/opengl_ext.cpp @@ -5,6 +5,24 @@ namespace yg { namespace gl { + const int GL_FRAMEBUFFER_BINDING_MWM = GL_FRAMEBUFFER_BINDING_EXT; + const int GL_FRAMEBUFFER_MWM = GL_FRAMEBUFFER_EXT; + const int GL_FRAMEBUFFER_UNSUPPORTED_MWM = GL_FRAMEBUFFER_UNSUPPORTED_EXT; + const int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_MWM = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT; + const int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_MWM = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT; + const int GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_MWM = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT; + const int GL_FRAMEBUFFER_COMPLETE_MWM = GL_FRAMEBUFFER_COMPLETE_EXT; + + const int GL_DEPTH_ATTACHMENT_MWM = GL_DEPTH_ATTACHMENT_EXT; + const int GL_COLOR_ATTACHMENT0_MWM = GL_COLOR_ATTACHMENT0_EXT; + const int GL_RENDERBUFFER_MWM = GL_RENDERBUFFER_EXT; + const int GL_RENDERBUFFER_BINDING_MWM = GL_RENDERBUFFER_BINDING_EXT; + const int GL_DEPTH_COMPONENT16_MWM = GL_DEPTH_COMPONENT16; + const int GL_DEPTH_COMPONENT24_MWM = GL_DEPTH_COMPONENT24; + const int GL_RGBA8_MWM = GL_RGBA8; + + const int GL_WRITE_ONLY_MWM = GL_WRITE_ONLY; + void InitExtensions() { DumpGLInformation(); diff --git a/yg/internal/opengl_win32.cpp b/yg/internal/opengl_win32.cpp index 7f04a9f333..4fc333e2b8 100644 --- a/yg/internal/opengl_win32.cpp +++ b/yg/internal/opengl_win32.cpp @@ -9,6 +9,24 @@ namespace yg { namespace gl { + const int GL_FRAMEBUFFER_BINDING_MWM = GL_FRAMEBUFFER_BINDING_EXT; + const int GL_FRAMEBUFFER_MWM = GL_FRAMEBUFFER_EXT; + const int GL_FRAMEBUFFER_UNSUPPORTED_MWM = GL_FRAMEBUFFER_UNSUPPORTED_EXT; + const int GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_MWM = GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT; + const int GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_MWM = GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT; + const int GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_MWM = GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT; + const int GL_FRAMEBUFFER_COMPLETE_MWM = GL_FRAMEBUFFER_COMPLETE_EXT; + + const int GL_DEPTH_ATTACHMENT_MWM = GL_DEPTH_ATTACHMENT_EXT; + const int GL_COLOR_ATTACHMENT0_MWM = GL_COLOR_ATTACHMENT0_EXT; + const int GL_RENDERBUFFER_MWM = GL_RENDERBUFFER_EXT; + const int GL_RENDERBUFFER_BINDING_MWM = GL_RENDERBUFFER_BINDING_EXT; + const int GL_DEPTH_COMPONENT16_MWM = GL_DEPTH_COMPONENT16; + const int GL_DEPTH_COMPONENT24_MWM = GL_DEPTH_COMPONENT24; + const int GL_RGBA8_MWM = GL_RGBA8; + + const int GL_WRITE_ONLY_MWM = GL_WRITE_ONLY; + //GL_FRAMEBUFFER_BINDING = GL_FRAMEBUFFER_BINDING_EXT; template