From 7fa069aec585316c34ada298ec557c7e800bf8f3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 1 Oct 2012 23:32:51 +0300 Subject: Using GL_ARB_sampler_objects. --- src/resources/openglimagehelper.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/resources/openglimagehelper.h') 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 #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 #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 -- cgit v1.2.3-60-g2f50