Use non _EXT postfix OpenGL macros.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@1908 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/common/gl/gl_check.cpp b/common/gl/gl_check.cpp
index 8a5e745b0b3e179090f84e9445d65cd6c4cc590c..361972063e1a1f22d019ed3a7c6d5838862d41ad 100644 (file)
--- a/common/gl/gl_check.cpp
+++ b/common/gl/gl_check.cpp
@@ -95,10 +95,10 @@ void SMFL_GLCheckError(const std::string& expr, const std::string& file, unsigne
                                        << line_info(line)\r
                                        << source_info(file));\r
 \r
-                       case GL_INVALID_FRAMEBUFFER_OPERATION_EXT :\r
+                       case GL_INVALID_FRAMEBUFFER_OPERATION :\r
                                BOOST_THROW_EXCEPTION(ogl_stack_underflow()\r
-                                       << msg_info("the object bound to FRAMEBUFFER_BINDING_EXT is not \"framebuffer complete\"")\r
-                                       << errorstr("GL_INVALID_FRAMEBUFFER_OPERATION_EXT")\r
+                                       << msg_info("the object bound to FRAMEBUFFER_BINDING is not \"framebuffer complete\"")\r
+                                       << errorstr("GL_INVALID_FRAMEBUFFER_OPERATION")\r
                                        << line_info(line)\r
                                        << source_info(file));\r
                }\r

diff --git a/core/mixer/gpu/ogl_device.cpp b/core/mixer/gpu/ogl_device.cpp
index f7f17f94e18ee4f124cff80b020cdec7066921ac..63d3d38db3a4e277c18b3ff1060b375de7309e32 100644 (file)
--- a/core/mixer/gpu/ogl_device.cpp
+++ b/core/mixer/gpu/ogl_device.cpp
@@ -349,10 +349,10 @@ void ogl_device::clear(device_buffer& texture)
 \r
 void ogl_device::read_buffer(device_buffer&)\r
 {\r
-       if(read_buffer_ != GL_COLOR_ATTACHMENT0_EXT)\r
+       if(read_buffer_ != GL_COLOR_ATTACHMENT0)\r
        {\r
-               GL(glReadBuffer(GL_COLOR_ATTACHMENT0_EXT));\r
-               read_buffer_ = GL_COLOR_ATTACHMENT0_EXT;\r
+               GL(glReadBuffer(GL_COLOR_ATTACHMENT0));\r
+               read_buffer_ = GL_COLOR_ATTACHMENT0;\r
        }\r
 }\r
 \r