Browse Source

Drop unusued LEGACYGL_ENABLED check

[ci skip]
Rémi Verschelde 8 years ago
parent
commit
79e247d74e

+ 1 - 1
platform/haiku/context_gl_haiku.cpp

@@ -29,7 +29,7 @@
 /*************************************************************************/
 #include "context_gl_haiku.h"
 
-#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+#if defined(OPENGL_ENABLED)
 
 ContextGL_Haiku::ContextGL_Haiku(HaikuDirectWindow *p_window) {
 	window = p_window;

+ 1 - 1
platform/haiku/context_gl_haiku.h

@@ -30,7 +30,7 @@
 #ifndef CONTEXT_GL_HAIKU_H
 #define CONTEXT_GL_HAIKU_H
 
-#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+#if defined(OPENGL_ENABLED)
 
 #include "drivers/gl_context/context_gl.h"
 

+ 2 - 2
platform/haiku/os_haiku.cpp

@@ -105,7 +105,7 @@ void OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p_
 		window->SetFlags(flags);
 	}
 
-#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+#if defined(OPENGL_ENABLED)
 	context_gl = memnew(ContextGL_Haiku(window));
 	context_gl->initialize();
 	context_gl->make_current();
@@ -161,7 +161,7 @@ void OS_Haiku::finalize() {
 
 	memdelete(input);
 
-#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+#if defined(OPENGL_ENABLED)
 	memdelete(context_gl);
 #endif
 }

+ 1 - 1
platform/haiku/os_haiku.h

@@ -60,7 +60,7 @@ private:
 	AudioDriverMediaKit driver_media_kit;
 #endif
 
-#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+#if defined(OPENGL_ENABLED)
 	ContextGL_Haiku *context_gl;
 #endif
 

+ 1 - 1
platform/windows/context_gl_win.cpp

@@ -27,7 +27,7 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED) || defined(GLES2_ENABLED)
+#if defined(OPENGL_ENABLED) || defined(GLES2_ENABLED)
 
 //
 // C++ Implementation: context_gl_x11

+ 1 - 1
platform/windows/context_gl_win.h

@@ -27,7 +27,7 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED) || defined(GLES2_ENABLED)
+#if defined(OPENGL_ENABLED) || defined(GLES2_ENABLED)
 //
 // C++ Interface: context_gl_x11
 //

+ 1 - 1
platform/x11/context_gl_x11.cpp

@@ -30,7 +30,7 @@
 #include "context_gl_x11.h"
 
 #ifdef X11_ENABLED
-#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+#if defined(OPENGL_ENABLED)
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

+ 1 - 1
platform/x11/context_gl_x11.h

@@ -35,7 +35,7 @@
 */
 #ifdef X11_ENABLED
 
-#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+#if defined(OPENGL_ENABLED)
 
 #include "drivers/gl_context/context_gl.h"
 #include "os/os.h"

+ 2 - 2
platform/x11/os_x11.cpp

@@ -235,7 +235,7 @@ void OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_au
 
 // maybe contextgl wants to be in charge of creating the window
 //print_line("def videomode "+itos(current_videomode.width)+","+itos(current_videomode.height));
-#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+#if defined(OPENGL_ENABLED)
 
 	context_gl = memnew(ContextGL_X11(x11_display, x11_window, current_videomode, true));
 	context_gl->initialize();
@@ -533,7 +533,7 @@ void OS_X11::finalize() {
 	XUnmapWindow(x11_display, x11_window);
 	XDestroyWindow(x11_display, x11_window);
 
-#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+#if defined(OPENGL_ENABLED)
 	memdelete(context_gl);
 #endif
 	for (int i = 0; i < CURSOR_MAX; i++) {

+ 1 - 1
platform/x11/os_x11.h

@@ -94,7 +94,7 @@ class OS_X11 : public OS_Unix {
 
 	int xdnd_version;
 
-#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+#if defined(OPENGL_ENABLED)
 	ContextGL_X11 *context_gl;
 #endif
 	//Rasterizer *rasterizer;