Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 741 vs 743 for /trunk/Source Code/Platform/Video/OpenGL/SDLWindowWrapper.cpp

Diff revisions: vs.
  @@ -151,8 +151,8 @@
151 151 _maxTextureUnits = GLUtil::getIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS);
152 152 _maxAttribBindings = GLUtil::getIntegerv(GL_MAX_VERTEX_ATTRIB_BINDINGS);
153 153
154 - DIVIDE_ASSERT(to_const_uint(AttribLocation::COUNT) < to_uint(_maxAttribBindings),
155 - "GL Wrapper: insufficient number of attribute binding locations available on current hardware!");
154 + assert(to_const_uint(AttribLocation::COUNT) < to_uint(_maxAttribBindings) &&
155 + "GL Wrapper: insufficient number of attribute binding locations available on current hardware!");
156 156
157 157 Console::printfn(Locale::get(_ID("GL_MAX_TEX_UNITS_FRAG")), _maxTextureUnits);
158 158
  @@ -356,7 +356,8 @@
356 356 assert(it == std::cend(GLUtil::_glSecondaryContexts));
357 357 // This also makes the context current
358 358 bool ctxFound = g_ContextPool.getAvailableContext(ctx);
359 - DIVIDE_ASSERT(ctxFound, "GL_API::syncToThread: context not found for current thread!");
359 + assert(ctxFound && "GL_API::syncToThread: context not found for current thread!");
360 + ACKNOWLEDGE_UNUSED(ctxFound);
360 361
361 362 hashAlg::emplace(GLUtil::_glSecondaryContexts, threadHash, ctx);
362 363 }