marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace obsolete GL_MAX_TEXTURE_UNITS (#1641) 

The replacement is GL_MAX_TEXTURE_IMAGE_UNITS.
objectmenu
Armin Burgmeier 2016-01-19 18:05:57 -08:00
parent 3810937867
commit b698557163
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/graphics/C4DrawMeshGL.cpp
View File

@ -281,9 +281,13 @@ bool CStdGL::PrepareMaterial(StdMeshMatManager& mat_manager, StdMeshMaterialLoad
StdMeshMaterialPass& pass = technique.Passes[j];
GLint max_texture_units;
glGetIntegerv(GL_MAX_TEXTURE_UNITS, &max_texture_units);
assert(max_texture_units >= 1);
glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &max_texture_units);
// OpenGL 3.x guarantees at least 16 TIUs. If the above returns
// less it's probably a driver bug. So just keep going.
assert(max_texture_units >= 16);
max_texture_units = std::min<GLint>(max_texture_units, 16);
unsigned int active_texture_units = 0;
for(unsigned int k = 0; k < pass.TextureUnits.size(); ++k)
if(pass.TextureUnits[k].HasTexture())