summaryrefslogtreecommitdiff
path: root/src/resources/openglimagehelper.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-01 23:32:51 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-01 23:45:06 +0300
commit7fa069aec585316c34ada298ec557c7e800bf8f3 (patch)
tree64cb7078677a695eb9cc429e4546114d06ff6d37 /src/resources/openglimagehelper.h
parentc195c960fc2ce7a5a211c26310ae98bfe39ab777 (diff)
downloadManaVerse-7fa069aec585316c34ada298ec557c7e800bf8f3.tar.gz
ManaVerse-7fa069aec585316c34ada298ec557c7e800bf8f3.tar.bz2
ManaVerse-7fa069aec585316c34ada298ec557c7e800bf8f3.tar.xz
ManaVerse-7fa069aec585316c34ada298ec557c7e800bf8f3.zip
Using GL_ARB_sampler_objects.
Diffstat (limited to 'src/resources/openglimagehelper.h')
-rw-r--r--src/resources/openglimagehelper.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/resources/openglimagehelper.h b/src/resources/openglimagehelper.h
index 292e18138..e1a6d48cc 100644
--- a/src/resources/openglimagehelper.h
+++ b/src/resources/openglimagehelper.h
@@ -33,14 +33,7 @@
#include <SDL.h>
#ifdef USE_OPENGL
-
-/* The definition of OpenGL extensions by SDL is giving problems with recent
- * gl.h headers, since they also include these definitions. As we're not using
- * extensions anyway it's safe to just disable the SDL version.
- */
-//#define NO_SDL_GLEXT
#define GL_GLEXT_PROTOTYPES 1
-
#include <SDL_opengl.h>
#endif
@@ -112,6 +105,11 @@ class OpenGLImageHelper final : public ImageHelper
static int getTextureSize()
{ return mTextureSize; }
+ static void initTextureSampler(GLint id);
+
+ static void setUseTextureSampler(bool b)
+ { mUseTextureSampler = b; }
+
protected:
/**
* Returns the first power of two equal or bigger than the input.
@@ -123,6 +121,7 @@ class OpenGLImageHelper final : public ImageHelper
static int mUseOpenGL;
static int mTextureSize;
static bool mBlur;
+ static bool mUseTextureSampler;
};
#endif