[Scummvm-git-logs] scummvm master -> 9fb035b10aeb2f8e360038e6ce9dc1571674901b

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9fb035b10a STARK: Added opengl ifdef gaurds


Commit: 9fb035b10aeb2f8e360038e6ce9dc1571674901b
    https://github.com/scummvm/scummvm/commit/9fb035b10aeb2f8e360038e6ce9dc1571674901b
Author: Paweł Kołodziejski (aquadran at users.sourceforge.net)
Date: 2020-10-15T08:30:05+02:00

Commit Message:
STARK: Added opengl ifdef gaurds

Changed paths:
    engines/stark/gfx/openglsactor.cpp
    engines/stark/gfx/openglsactor.h
    engines/stark/gfx/openglsfade.cpp
    engines/stark/gfx/openglsfade.h
    engines/stark/gfx/openglsprop.cpp
    engines/stark/gfx/openglsprop.h
    engines/stark/gfx/openglssurface.cpp
    engines/stark/gfx/openglssurface.h
    engines/stark/gfx/opengltexture.cpp
    engines/stark/gfx/opengltexture.h


diff --git a/engines/stark/gfx/openglsactor.cpp b/engines/stark/gfx/openglsactor.cpp
index eadb6ab8c8..4ef1b9fc9b 100644
--- a/engines/stark/gfx/openglsactor.cpp
+++ b/engines/stark/gfx/openglsactor.cpp
@@ -30,6 +30,8 @@
 #include "engines/stark/gfx/opengls.h"
 #include "engines/stark/gfx/texture.h"
 
+#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
+
 #include "graphics/opengl/shader.h"
 
 namespace Stark {
@@ -428,3 +430,5 @@ bool OpenGLSActorRenderer::getSpotLightContribution(LightEntry *light,
 
 } // End of namespace Gfx
 } // End of namespace Stark
+
+#endif // defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
diff --git a/engines/stark/gfx/openglsactor.h b/engines/stark/gfx/openglsactor.h
index 5ba444ba33..93c55e54d6 100644
--- a/engines/stark/gfx/openglsactor.h
+++ b/engines/stark/gfx/openglsactor.h
@@ -31,6 +31,8 @@
 
 #include "graphics/opengl/system_headers.h"
 
+#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
+
 namespace OpenGL {
 	class ShaderGL;
 }
@@ -75,4 +77,6 @@ protected:
 } // End of namespace Gfx
 } // End of namespace Stark
 
+#endif // defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
+
 #endif // STARK_GFX_OPENGL_S_ACTOR_H
diff --git a/engines/stark/gfx/openglsfade.cpp b/engines/stark/gfx/openglsfade.cpp
index 0215b2837a..f56b9c217c 100644
--- a/engines/stark/gfx/openglsfade.cpp
+++ b/engines/stark/gfx/openglsfade.cpp
@@ -24,6 +24,8 @@
 
 #include "engines/stark/gfx/opengls.h"
 
+#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
+
 #include "graphics/opengl/shader.h"
 
 namespace Stark {
@@ -52,3 +54,5 @@ void OpenGLSFadeRenderer::render(float fadeLevel) {
 
 } // End of namespace Gfx
 } // End of namespace Stark
+
+#endif // defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
diff --git a/engines/stark/gfx/openglsfade.h b/engines/stark/gfx/openglsfade.h
index f7c0dac3c9..96b941dfa5 100644
--- a/engines/stark/gfx/openglsfade.h
+++ b/engines/stark/gfx/openglsfade.h
@@ -23,6 +23,10 @@
 #ifndef STARK_GFX_OPENGL_S_FADE_H
 #define STARK_GFX_OPENGL_S_FADE_H
 
+#include "graphics/opengl/system_headers.h"
+
+#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
+
 #include "engines/stark/gfx/faderenderer.h"
 
 namespace OpenGL {
@@ -53,4 +57,6 @@ private:
 } // End of namespace Gfx
 } // End of namespace Stark
 
+#endif // defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
+
 #endif // STARK_GFX_OPENGL_S_FADE_H
diff --git a/engines/stark/gfx/openglsprop.cpp b/engines/stark/gfx/openglsprop.cpp
index 0f8e6a331c..e2e45eb471 100644
--- a/engines/stark/gfx/openglsprop.cpp
+++ b/engines/stark/gfx/openglsprop.cpp
@@ -28,6 +28,8 @@
 #include "engines/stark/scene.h"
 #include "engines/stark/services/services.h"
 
+#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
+
 #include "graphics/opengl/shader.h"
 
 namespace Stark {
@@ -190,3 +192,5 @@ void OpenGLSPropRenderer::setLightArrayUniform(const LightEntryArray &lights) {
 
 } // End of namespace Gfx
 } // End of namespace Stark
+
+#endif // defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
diff --git a/engines/stark/gfx/openglsprop.h b/engines/stark/gfx/openglsprop.h
index e1904e4d7a..de03dfc27c 100644
--- a/engines/stark/gfx/openglsprop.h
+++ b/engines/stark/gfx/openglsprop.h
@@ -31,6 +31,8 @@
 
 #include "graphics/opengl/system_headers.h"
 
+#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
+
 namespace OpenGL {
 	class ShaderGL;
 }
@@ -71,3 +73,5 @@ protected:
 } // End of namespace Stark
 
 #endif // STARK_GFX_OPENGL_S_RENDERED_H
+
+#endif // defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
diff --git a/engines/stark/gfx/openglssurface.cpp b/engines/stark/gfx/openglssurface.cpp
index 1f03d1f08c..f0317d65c5 100644
--- a/engines/stark/gfx/openglssurface.cpp
+++ b/engines/stark/gfx/openglssurface.cpp
@@ -25,6 +25,8 @@
 #include "engines/stark/gfx/opengls.h"
 #include "engines/stark/gfx/texture.h"
 
+#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
+
 #include "graphics/opengl/shader.h"
 
 namespace Stark {
@@ -80,3 +82,5 @@ Math::Vector2d OpenGLSSurfaceRenderer::normalizeCurrentCoordinates(int x, int y)
 
 } // End of namespace Gfx
 } // End of namespace Stark
+
+#endif // if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
diff --git a/engines/stark/gfx/openglssurface.h b/engines/stark/gfx/openglssurface.h
index 39a9913ac8..484b0039b9 100644
--- a/engines/stark/gfx/openglssurface.h
+++ b/engines/stark/gfx/openglssurface.h
@@ -27,6 +27,8 @@
 
 #include "math/vector2d.h"
 
+#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
+
 namespace OpenGL {
 class ShaderGL;
 }
@@ -60,4 +62,6 @@ private:
 } // End of namespace Gfx
 } // End of namespace Stark
 
+#endif // defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
+
 #endif // STARK_GFX_OPENGL_S_SURFACE_H
diff --git a/engines/stark/gfx/opengltexture.cpp b/engines/stark/gfx/opengltexture.cpp
index cfef3b8f79..281a4d5f6c 100644
--- a/engines/stark/gfx/opengltexture.cpp
+++ b/engines/stark/gfx/opengltexture.cpp
@@ -26,6 +26,8 @@
 
 #include "graphics/surface.h"
 
+#if defined(USE_OPENGL_GAME) || defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
+
 namespace Stark {
 namespace Gfx {
 
@@ -127,3 +129,5 @@ void OpenGlTexture::addLevel(uint32 level, const Graphics::Surface *surface, con
 
 } // End of namespace Gfx
 } // End of namespace Stark
+
+#endif // defined(USE_OPENGL_GAME) || defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
diff --git a/engines/stark/gfx/opengltexture.h b/engines/stark/gfx/opengltexture.h
index e3da725b7a..9eb327c2e7 100644
--- a/engines/stark/gfx/opengltexture.h
+++ b/engines/stark/gfx/opengltexture.h
@@ -27,6 +27,8 @@
 
 #include "graphics/opengl/system_headers.h"
 
+#if defined(USE_OPENGL_GAME) || defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
+
 namespace Stark {
 namespace Gfx {
 
@@ -55,4 +57,6 @@ protected:
 } // End of namespace Gfx
 } // End of namespace Stark
 
+#endif // defined(USE_OPENGL_GAME) || defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
+
 #endif // STARK_GFX_OPENGL_TEXTURE_H