GRAPHICS: Move common OpenGL files into graphics/opengl

backends/graphics/surfacesdl/surfacesdl-graphics.cpp

@@ -45,7 +45,7 @@
 #include "gui/EventRecorder.h"
 
 #ifdef USE_OPENGL
-#include "graphics/opengles2/extensions.h"
+#include "graphics/opengl/extensions.h"
 #endif
 
 static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {

backends/graphics/surfacesdl/surfacesdl-graphics.h

@@ -24,8 +24,8 @@
 #define BACKENDS_GRAPHICS_SURFACESDL_GRAPHICS_H
 
 #ifdef USE_OPENGL
-#include "graphics/opengles2/system_headers.h"
-#include "graphics/opengles2/framebuffer.h"
+#include "graphics/opengl/system_headers.h"
+#include "graphics/opengl/framebuffer.h"
 #endif
 
 #undef ARRAYSIZE

backends/platform/android/android.h

@@ -31,8 +31,8 @@
 #include "graphics/palette.h"
 #include "graphics/surface.h"
 #include "graphics/pixelbuffer.h"
-#include "graphics/opengles2/system_headers.h"
-#include "graphics/opengles2/framebuffer.h"
+#include "graphics/opengl/system_headers.h"
+#include "graphics/opengl/framebuffer.h"
 #include "backends/base-backend.h"
 #include "backends/plugins/posix/posix-provider.h"
 #include "backends/fs/posix/posix-fs-factory.h"

backends/platform/android/gfx.cpp

@@ -43,7 +43,7 @@
 #include "common/tokenizer.h"
 #include "graphics/conversion.h"
 #include "graphics/opengles2/shader.h"
-#include "graphics/opengles2/extensions.h"
+#include "graphics/opengl/extensions.h"
 
 #include "backends/platform/android/android.h"
 #include "backends/platform/android/jni.h"

backends/platform/android/texture.cpp

@@ -42,7 +42,7 @@
 #include "base/main.h"
 #include "graphics/surface.h"
 #include "graphics/opengles2/shader.h"
-#include "graphics/opengles2/extensions.h"
+#include "graphics/opengl/extensions.h"
 
 #include "common/rect.h"
 #include "common/array.h"

engines/myst3/gfx_opengl_shaders.cpp

@@ -57,7 +57,7 @@
 #include "math/rect2d.h"
 #include "math/quat.h"
 
-#include "graphics/opengles2/extensions.h"
+#include "graphics/opengl/extensions.h"
 #include "graphics/opengles2/shader.h"
 
 #include "engines/myst3/gfx.h"

engines/myst3/gfx_opengl_texture.h

@@ -24,7 +24,7 @@
 #define GFX_OPENGL_TEXTURE_H
 
 #include "graphics/surface.h"
-#include "graphics/opengles2/system_headers.h"
+#include "graphics/opengl/system_headers.h"
 #include "common/textconsole.h"
 
 #include "engines/myst3/gfx.h"

graphics/module.mk

@@ -25,10 +25,10 @@ MODULE_OBJS := \
 	yuv_to_rgb.o \
 	yuva_to_rgba.o \
 	pixelbuffer.o \
-	opengles2/extensions.o \
+	opengl/framebuffer.o \
+	opengl/texture.o \
+	opengl/extensions.o \
 	opengles2/shader.o \
-	opengles2/framebuffer.o \
-	opengles2/texture.o \
 	opengles2/box_shaders.o \
 	opengles2/control_shaders.o \
 	opengles2/compat_shaders.o \

graphics/opengl/extensions.cpp

@@ -25,7 +25,7 @@
 #include "common/str.h"
 #include "common/tokenizer.h"
 
-#include "graphics/opengles2/system_headers.h"
+#include "graphics/opengl/system_headers.h"
 
 #ifdef USE_OPENGL
 

graphics/opengl/framebuffer.cpp

@@ -25,10 +25,10 @@
 #if defined(USE_OPENGL) && !defined(AMIGAOS)
 
 #ifdef USE_OPENGL_SHADERS
-#include "graphics/opengles2/framebuffer.h"
+#include "graphics/opengl/framebuffer.h"
 #elif defined(SDL_BACKEND)
 #define GL_GLEXT_PROTOTYPES // For the GL_EXT_framebuffer_object extension
-#include "graphics/opengles2/framebuffer.h"
+#include "graphics/opengl/framebuffer.h"
 #ifndef GL_ARB_framebuffer_object
 #define GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
 #define GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT
@@ -42,7 +42,7 @@
 #include "backends/platform/sdl/sdl-sys.h"
 #endif // defined(SDL_BACKEND)
 
-#include "graphics/opengles2/extensions.h"
+#include "graphics/opengl/extensions.h"
 
 #ifdef USE_GLES2
 #define GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_OES

graphics/opengl/framebuffer.h

@@ -23,8 +23,8 @@
 #ifndef GRAPHICS_FRAMEBUFFER_H
 #define GRAPHICS_FRAMEBUFFER_H
 
-#include "graphics/opengles2/system_headers.h"
-#include "graphics/opengles2/texture.h"
+#include "graphics/opengl/system_headers.h"
+#include "graphics/opengl/texture.h"
 
 namespace Graphics {
 

graphics/opengl/texture.cpp

@@ -24,7 +24,7 @@
 
 #if defined(USE_OPENGL)
 
-#include "graphics/opengles2/texture.h"
+#include "graphics/opengl/texture.h"
 
 
 namespace Graphics {

graphics/opengl/texture.h

@@ -23,7 +23,7 @@
 #ifndef GRAPHICS_TEXTURE_H
 #define GRAPHICS_TEXTURE_H
 
-#include "graphics/opengles2/system_headers.h"
+#include "graphics/opengl/system_headers.h"
 
 #include "graphics/surface.h"
 

graphics/opengles2/shader.h

@@ -33,7 +33,7 @@
 #include "math/vector3d.h"
 #include "math/vector4d.h"
 
-#include "graphics/opengles2/system_headers.h"
+#include "graphics/opengl/system_headers.h"
 
 namespace Graphics {