Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 334 vs 337 for /trunk/Source Code/Platform/Video/OpenGL/GLStates.cpp

Diff revisions: vs.
  @@ -198,8 +198,8 @@
198 198 /// Bind a texture specified by a GL handle and GL type to the specified unit using the sampler object defined by hash value
199 199 bool GL_API::bindTexture(GLuint unit, GLuint handle, GLenum type, size_t samplerHash) {
200 200 // Fail if we specified an invalid unit. Assert instead of returning false because this might be related to a bad algorithm
201 - DIVIDE_ASSERT(unit < static_cast<GLuint>(ParamHandler::getInstance().getParam<I32>("rendering.maxTextureSlots", 16)),
202 - "GLStates error: invalid texture unit specified as a texture binding slot!");
201 + DIVIDE_ASSERT(unit < static_cast<GLuint>(ParamHandler::getInstance().getParam<I32>("rendering.maxTextureSlots", 16)),
202 + "GLStates error: invalid texture unit specified as a texture binding slot!");
203 203 // Bind the sampler object first, as we may just require a sampler update instead of a full texture rebind
204 204 GL_API::bindSampler(unit, samplerHash);
205 205 // Prevent double bind only for the texture