From 56cfe4d3a38a2440622cf32f613a2b57ae5b3852 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 6 Oct 2012 21:15:02 +0300 Subject: Disable rectangular textures if texture sampler enabled. --- src/graphics.cpp | 3 ++- src/graphicsmanager.h | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/graphics.cpp b/src/graphics.cpp index 8b83880a7..6657fe3c1 100644 --- a/src/graphics.cpp +++ b/src/graphics.cpp @@ -175,7 +175,8 @@ bool Graphics::setOpenGLMode() bool rectTex = graphicsManager.supportExtension( "GL_ARB_texture_rectangle"); if (rectTex && OpenGLImageHelper::getInternalTextureType() == 4 - && config.getBoolValue("rectangulartextures")) + && config.getBoolValue("rectangulartextures") + && !graphicsManager.isUseTextureSampler()) { logger->log1("using GL_ARB_texture_rectangle"); OpenGLImageHelper::mTextureType = GL_TEXTURE_RECTANGLE_ARB; diff --git a/src/graphicsmanager.h b/src/graphicsmanager.h index 40126dc1d..1a095422e 100644 --- a/src/graphicsmanager.h +++ b/src/graphicsmanager.h @@ -93,6 +93,10 @@ class GraphicsManager final bool getUseAtlases() const { return mUseAtlases; } +#ifdef USE_OPENGL + bool isUseTextureSampler() const + { return mUseTextureSampler; } +#endif unsigned int getLastError(); private: -- cgit v1.2.3-60-g2f50