diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-06 21:15:02 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-06 21:15:02 +0300 |
| commit | 56cfe4d3a38a2440622cf32f613a2b57ae5b3852 (patch) | |
| tree | 556f69d83c770dd861e0dab59ab3db8429929bbd | |
| parent | fdbd1a4c521c537597b63cd4f2262517cab1f81a (diff) | |
| download | ManaVerse-56cfe4d3a38a2440622cf32f613a2b57ae5b3852.tar.gz ManaVerse-56cfe4d3a38a2440622cf32f613a2b57ae5b3852.tar.bz2 ManaVerse-56cfe4d3a38a2440622cf32f613a2b57ae5b3852.tar.xz ManaVerse-56cfe4d3a38a2440622cf32f613a2b57ae5b3852.zip | |
Disable rectangular textures if texture sampler enabled.
| -rw-r--r-- | src/graphics.cpp | 3 | ||||
| -rw-r--r-- | src/graphicsmanager.h | 4 |
2 files changed, 6 insertions, 1 deletions
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: |