diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2016-10-10 08:08:49 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2016-10-10 08:19:10 +0300 |
| commit | 33ef28068a87239f5d4e7170b2fcf7eb704da716 (patch) | |
| tree | cb3710a5d5991f95955e89075c370ce04b6777b4 /source/gameengine/Ketsji | |
| parent | 9ea71bc674130289d4f647c12f60ef51838665d9 (diff) | |
BGE: remove calls to GLSL support query (it's always supported)
Reworked logic in the few places that still called this. Deleted the "GLSL not supported" fallbacks.
Also removed some nearby checks for ARB_multitexture and OpenGL 1.1. Blender 2.77 removed checks like this, but game engine still has some.
Diffstat (limited to 'source/gameengine/Ketsji')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Texture.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source/gameengine/Ketsji/BL_Texture.cpp b/source/gameengine/Ketsji/BL_Texture.cpp index 730e49c4918..cc7fea5ad25 100644 --- a/source/gameengine/Ketsji/BL_Texture.cpp +++ b/source/gameengine/Ketsji/BL_Texture.cpp @@ -420,14 +420,7 @@ int BL_Texture::GetMaxUnits() { if (g_max_units < 0) { GLint unit = 0; - - if (GPU_glsl_support()) { - glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &unit); - } - else if (GLEW_ARB_multitexture) { - glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &unit); - } - + glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &unit); g_max_units = (MAXTEX >= unit) ? unit : MAXTEX; } |