griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

BGE: remove calls to GLSL support query (it's always supported)

Browse Source 
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.
This commit is contained in:
Mike Erwin
2016-10-10 01:08:49 -04:00
parent 9ea71bc674
commit 33ef28068a
3 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/gameengine/Ketsji/BL_Texture.cpp
View File

@@ -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;
}