Skip to content

A
angle
Commit de0ec75e by Jamie Madill
Options

Replace catch blocks from std::bad_alloc to ellipses.

It seems we weren't catching bad_alloc despite using the correct syntax. Using ellipses solves the problem, and since we only expect bad_alloc it does the equivalent result of catching and returning out of memory. I'm currently not aware of the proper syntax to catch bad_alloc. BUg=angle:634 Change-Id: Ib3154546d1b72d180cb565c71f35716696863cdd Reviewed-on: https://chromium-review.googlesource.com/198245Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarNicolas Capens <nicolascapens@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent cc14f104
Showing with 258 additions and 258 deletions
src/libGLESv2/libGLESv2.cpp
......@@ -52,7 +52,7 @@ void __stdcall glActiveTexture(GLenum texture)
context->setActiveSampler(texture - GL_TEXTURE0);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -101,7 +101,7 @@ void __stdcall glAttachShader(GLuint program, GLuint shader)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -130,7 +130,7 @@ void __stdcall glBeginQueryEXT(GLenum target, GLuint id)
context->beginQuery(target, id);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -173,7 +173,7 @@ void __stdcall glBindAttribLocation(GLuint program, GLuint index, const GLchar*
programObject->bindAttributeLocation(index, name);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -225,7 +225,7 @@ void __stdcall glBindBuffer(GLenum target, GLuint buffer)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -257,7 +257,7 @@ void __stdcall glBindFramebuffer(GLenum target, GLuint framebuffer)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -281,7 +281,7 @@ void __stdcall glBindRenderbuffer(GLenum target, GLuint renderbuffer)
context->bindRenderbuffer(renderbuffer);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -331,7 +331,7 @@ void __stdcall glBindTexture(GLenum target, GLuint texture)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -351,7 +351,7 @@ void __stdcall glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclamp
context->setBlendColor(gl::clamp01(red), gl::clamp01(green), gl::clamp01(blue), gl::clamp01(alpha));
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -401,7 +401,7 @@ void __stdcall glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
context->setBlendEquation(modeRGB, modeAlpha);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -540,7 +540,7 @@ void __stdcall glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha
context->setBlendFactors(srcRGB, dstRGB, srcAlpha, dstAlpha);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -600,7 +600,7 @@ void __stdcall glBufferData(GLenum target, GLsizeiptr size, const GLvoid* data,
buffer->bufferData(data, size, usage);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -658,7 +658,7 @@ void __stdcall glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size,
buffer->bufferSubData(data, size, offset);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -684,7 +684,7 @@ GLenum __stdcall glCheckFramebufferStatus(GLenum target)
return framebuffer->completeness();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, 0);
}
......@@ -717,7 +717,7 @@ void __stdcall glClear(GLbitfield mask)
context->clear(mask);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -737,7 +737,7 @@ void __stdcall glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclamp
context->setClearColor(red, green, blue, alpha);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -756,7 +756,7 @@ void __stdcall glClearDepthf(GLclampf depth)
context->setClearDepth(depth);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -775,7 +775,7 @@ void __stdcall glClearStencil(GLint s)
context->setClearStencil(s);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -795,7 +795,7 @@ void __stdcall glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboo
context->setColorMask(red == GL_TRUE, green == GL_TRUE, blue == GL_TRUE, alpha == GL_TRUE);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -828,7 +828,7 @@ void __stdcall glCompileShader(GLuint shader)
shaderObject->compile();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -892,7 +892,7 @@ void __stdcall glCompressedTexImage2D(GLenum target, GLint level, GLenum interna
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -957,7 +957,7 @@ void __stdcall glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffs
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1017,7 +1017,7 @@ void __stdcall glCopyTexImage2D(GLenum target, GLint level, GLenum internalforma
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1078,7 +1078,7 @@ void __stdcall glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GL
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1097,7 +1097,7 @@ GLuint __stdcall glCreateProgram(void)
return context->createProgram();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, 0);
}
......@@ -1125,7 +1125,7 @@ GLuint __stdcall glCreateShader(GLenum type)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, 0);
}
......@@ -1157,7 +1157,7 @@ void __stdcall glCullFace(GLenum mode)
return gl::error(GL_INVALID_ENUM);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1184,7 +1184,7 @@ void __stdcall glDeleteBuffers(GLsizei n, const GLuint* buffers)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1211,7 +1211,7 @@ void __stdcall glDeleteFencesNV(GLsizei n, const GLuint* fences)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1241,7 +1241,7 @@ void __stdcall glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1277,7 +1277,7 @@ void __stdcall glDeleteProgram(GLuint program)
context->deleteProgram(program);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1304,7 +1304,7 @@ void __stdcall glDeleteQueriesEXT(GLsizei n, const GLuint *ids)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1331,7 +1331,7 @@ void __stdcall glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1367,7 +1367,7 @@ void __stdcall glDeleteShader(GLuint shader)
context->deleteShader(shader);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1397,7 +1397,7 @@ void __stdcall glDeleteTextures(GLsizei n, const GLuint* textures)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1431,7 +1431,7 @@ void __stdcall glDepthFunc(GLenum func)
context->setDepthFunc(func);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1450,7 +1450,7 @@ void __stdcall glDepthMask(GLboolean flag)
context->setDepthMask(flag != GL_FALSE);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1469,7 +1469,7 @@ void __stdcall glDepthRangef(GLclampf zNear, GLclampf zFar)
context->setDepthRange(zNear, zFar);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1522,7 +1522,7 @@ void __stdcall glDetachShader(GLuint program, GLuint shader)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1546,7 +1546,7 @@ void __stdcall glDisable(GLenum cap)
context->setCap(cap, false);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1570,7 +1570,7 @@ void __stdcall glDisableVertexAttribArray(GLuint index)
context->setEnableVertexAttribArray(index, false);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1610,7 +1610,7 @@ void __stdcall glDrawArrays(GLenum mode, GLint first, GLsizei count)
context->drawArrays(mode, first, count, 0);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1653,7 +1653,7 @@ void __stdcall glDrawArraysInstancedANGLE(GLenum mode, GLint first, GLsizei coun
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1707,7 +1707,7 @@ void __stdcall glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLv
context->drawElements(mode, count, type, indices, 0);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1764,7 +1764,7 @@ void __stdcall glDrawElementsInstancedANGLE(GLenum mode, GLsizei count, GLenum t
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1788,7 +1788,7 @@ void __stdcall glEnable(GLenum cap)
context->setCap(cap, true);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1812,7 +1812,7 @@ void __stdcall glEnableVertexAttribArray(GLuint index)
context->setEnableVertexAttribArray(index, true);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1836,7 +1836,7 @@ void __stdcall glEndQueryEXT(GLenum target)
context->endQuery(target);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1867,7 +1867,7 @@ void __stdcall glFinishFenceNV(GLuint fence)
fenceObject->finishFence();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1886,7 +1886,7 @@ void __stdcall glFinish(void)
context->sync(true);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1905,7 +1905,7 @@ void __stdcall glFlush(void)
context->sync(false);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -1960,7 +1960,7 @@ void __stdcall glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenu
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2011,7 +2011,7 @@ void __stdcall glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum t
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2040,7 +2040,7 @@ void __stdcall glFrontFace(GLenum mode)
return gl::error(GL_INVALID_ENUM);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2067,7 +2067,7 @@ void __stdcall glGenBuffers(GLsizei n, GLuint* buffers)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2131,7 +2131,7 @@ void __stdcall glGenerateMipmap(GLenum target)
texture->generateMipmaps();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2158,7 +2158,7 @@ void __stdcall glGenFencesNV(GLsizei n, GLuint* fences)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2185,7 +2185,7 @@ void __stdcall glGenFramebuffers(GLsizei n, GLuint* framebuffers)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2212,7 +2212,7 @@ void __stdcall glGenQueriesEXT(GLsizei n, GLuint* ids)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2239,7 +2239,7 @@ void __stdcall glGenRenderbuffers(GLsizei n, GLuint* renderbuffers)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2266,7 +2266,7 @@ void __stdcall glGenTextures(GLsizei n, GLuint* textures)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2311,7 +2311,7 @@ void __stdcall glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize,
programObject->getActiveAttribute(index, bufsize, length, size, type, name);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2356,7 +2356,7 @@ void __stdcall glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize,
programObject->getActiveUniform(index, bufsize, length, size, type, name);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2395,7 +2395,7 @@ void __stdcall glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* c
return programObject->getAttachedShaders(maxcount, count, shaders);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2435,7 +2435,7 @@ int __stdcall glGetAttribLocation(GLuint program, const GLchar* name)
return programBinary->getAttributeLocation(name);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, -1);
}
......@@ -2472,7 +2472,7 @@ void __stdcall glGetBooleanv(GLenum pname, GLboolean* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2530,7 +2530,7 @@ void __stdcall glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2585,7 +2585,7 @@ void __stdcall glGetFenceivNV(GLuint fence, GLenum pname, GLint *params)
params[0] = fenceObject->getFencei(pname);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2620,7 +2620,7 @@ void __stdcall glGetFloatv(GLenum pname, GLfloat* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2923,7 +2923,7 @@ void __stdcall glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attac
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -2944,7 +2944,7 @@ GLenum __stdcall glGetGraphicsResetStatusEXT(void)
return GL_NO_ERROR;
}
catch(std::bad_alloc&)
catch (...)
{
return GL_OUT_OF_MEMORY;
}
......@@ -2979,7 +2979,7 @@ void __stdcall glGetIntegerv(GLenum pname, GLint* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3067,7 +3067,7 @@ void __stdcall glGetProgramiv(GLuint program, GLenum pname, GLint* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3099,7 +3099,7 @@ void __stdcall glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* len
programObject->getInfoLog(bufsize, length, infolog);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3131,7 +3131,7 @@ void __stdcall glGetQueryivEXT(GLenum target, GLenum pname, GLint *params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3172,7 +3172,7 @@ void __stdcall glGetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint *params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3226,7 +3226,7 @@ void __stdcall glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint*
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3274,7 +3274,7 @@ void __stdcall glGetShaderiv(GLuint shader, GLenum pname, GLint* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3306,7 +3306,7 @@ void __stdcall glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* lengt
shaderObject->getInfoLog(bufsize, length, infolog);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3351,7 +3351,7 @@ void __stdcall glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontyp
return gl::error(GL_INVALID_ENUM);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3383,7 +3383,7 @@ void __stdcall glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length
shaderObject->getSource(bufsize, length, source);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3415,7 +3415,7 @@ void __stdcall glGetTranslatedShaderSourceANGLE(GLuint shader, GLsizei bufsize,
shaderObject->getTranslatedSource(bufsize, length, source);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3459,7 +3459,7 @@ const GLubyte* __stdcall glGetString(GLenum name)
return gl::error(GL_INVALID_ENUM, (GLubyte*)NULL);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, (GLubyte*)NULL);
}
......@@ -3585,7 +3585,7 @@ void __stdcall glGetTexParameterfv(GLenum target, GLenum pname, GLfloat* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3711,7 +3711,7 @@ void __stdcall glGetTexParameteriv(GLenum target, GLenum pname, GLint* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3757,7 +3757,7 @@ void __stdcall glGetnUniformfvEXT(GLuint program, GLint location, GLsizei bufSiz
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3797,7 +3797,7 @@ void __stdcall glGetUniformfv(GLuint program, GLint location, GLfloat* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3843,7 +3843,7 @@ void __stdcall glGetnUniformivEXT(GLuint program, GLint location, GLsizei bufSiz
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3883,7 +3883,7 @@ void __stdcall glGetUniformiv(GLuint program, GLint location, GLint* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -3927,7 +3927,7 @@ int __stdcall glGetUniformLocation(GLuint program, const GLchar* name)
return programBinary->getUniformLocation(name);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, -1);
}
......@@ -3971,7 +3971,7 @@ void __stdcall glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4014,7 +4014,7 @@ void __stdcall glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4043,7 +4043,7 @@ void __stdcall glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid** po
*pointer = const_cast<GLvoid*>(context->getVertexAttribPointer(index));
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4078,7 +4078,7 @@ void __stdcall glHint(GLenum target, GLenum mode)
return gl::error(GL_INVALID_ENUM);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4102,7 +4102,7 @@ GLboolean __stdcall glIsBuffer(GLuint buffer)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -4128,7 +4128,7 @@ GLboolean __stdcall glIsEnabled(GLenum cap)
return context->getCap(cap);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, false);
}
......@@ -4156,7 +4156,7 @@ GLboolean __stdcall glIsFenceNV(GLuint fence)
return fenceObject->isFence();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -4182,7 +4182,7 @@ GLboolean __stdcall glIsFramebuffer(GLuint framebuffer)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -4208,7 +4208,7 @@ GLboolean __stdcall glIsProgram(GLuint program)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -4229,7 +4229,7 @@ GLboolean __stdcall glIsQueryEXT(GLuint id)
return (context->getQuery(id, false, GL_NONE) != NULL) ? GL_TRUE : GL_FALSE;
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -4255,7 +4255,7 @@ GLboolean __stdcall glIsRenderbuffer(GLuint renderbuffer)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -4281,7 +4281,7 @@ GLboolean __stdcall glIsShader(GLuint shader)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -4307,7 +4307,7 @@ GLboolean __stdcall glIsTexture(GLuint texture)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -4333,7 +4333,7 @@ void __stdcall glLineWidth(GLfloat width)
context->setLineWidth(width);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4366,7 +4366,7 @@ void __stdcall glLinkProgram(GLuint program)
context->linkProgram(program);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4426,7 +4426,7 @@ void __stdcall glPixelStorei(GLenum pname, GLint param)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4445,7 +4445,7 @@ void __stdcall glPolygonOffset(GLfloat factor, GLfloat units)
context->setPolygonOffsetParams(factor, units);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4479,7 +4479,7 @@ void __stdcall glReadnPixelsEXT(GLint x, GLint y, GLsizei width, GLsizei height,
context->readPixels(x, y, width, height, format, type, &bufSize, data);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4512,7 +4512,7 @@ void __stdcall glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height,
context->readPixels(x, y, width, height, format, type, NULL, pixels);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4526,7 +4526,7 @@ void __stdcall glReleaseShaderCompiler(void)
{
gl::Shader::releaseCompiler();
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4552,7 +4552,7 @@ void __stdcall glRenderbufferStorageMultisampleANGLE(GLenum target, GLsizei samp
context->setRenderbufferStorage(width, height, internalformat, samples);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4576,7 +4576,7 @@ void __stdcall glSampleCoverage(GLclampf value, GLboolean invert)
context->setSampleCoverageParams(gl::clamp01(value), invert == GL_TRUE);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4607,7 +4607,7 @@ void __stdcall glSetFenceNV(GLuint fence, GLenum condition)
fenceObject->setFence(condition);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4631,7 +4631,7 @@ void __stdcall glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
context->setScissorParams(x, y, width, height);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4648,7 +4648,7 @@ void __stdcall glShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryfor
// No binary shader formats are supported.
return gl::error(GL_INVALID_ENUM);
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4687,7 +4687,7 @@ void __stdcall glShaderSource(GLuint shader, GLsizei count, const GLchar* const*
shaderObject->setSource(count, string, length);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4744,7 +4744,7 @@ void __stdcall glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4786,7 +4786,7 @@ void __stdcall glStencilMaskSeparate(GLenum face, GLuint mask)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4874,7 +4874,7 @@ void __stdcall glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenu
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4905,7 +4905,7 @@ GLboolean __stdcall glTestFenceNV(GLuint fence)
return fenceObject->testFence();
}
}
catch(std::bad_alloc&)
catch (...)
{
gl::error(GL_OUT_OF_MEMORY);
}
......@@ -4988,7 +4988,7 @@ void __stdcall glTexImage2D(GLenum target, GLint level, GLint internalformat, GL
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5039,7 +5039,7 @@ void __stdcall glTexParameterf(GLenum target, GLenum pname, GLfloat param)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5095,7 +5095,7 @@ void __stdcall glTexParameteri(GLenum target, GLenum pname, GLint param)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5150,7 +5150,7 @@ void __stdcall glTexStorage2DEXT(GLenum target, GLsizei levels, GLenum internalf
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5216,7 +5216,7 @@ void __stdcall glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5259,7 +5259,7 @@ void __stdcall glUniform1fv(GLint location, GLsizei count, const GLfloat* v)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5302,7 +5302,7 @@ void __stdcall glUniform1iv(GLint location, GLsizei count, const GLint* v)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5347,7 +5347,7 @@ void __stdcall glUniform2fv(GLint location, GLsizei count, const GLfloat* v)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5392,7 +5392,7 @@ void __stdcall glUniform2iv(GLint location, GLsizei count, const GLint* v)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5437,7 +5437,7 @@ void __stdcall glUniform3fv(GLint location, GLsizei count, const GLfloat* v)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5482,7 +5482,7 @@ void __stdcall glUniform3iv(GLint location, GLsizei count, const GLint* v)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5527,7 +5527,7 @@ void __stdcall glUniform4fv(GLint location, GLsizei count, const GLfloat* v)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5572,7 +5572,7 @@ void __stdcall glUniform4iv(GLint location, GLsizei count, const GLint* v)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5616,7 +5616,7 @@ void __stdcall glUniformMatrix2fv(GLint location, GLsizei count, GLboolean trans
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5660,7 +5660,7 @@ void __stdcall glUniformMatrix3fv(GLint location, GLsizei count, GLboolean trans
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5704,7 +5704,7 @@ void __stdcall glUniformMatrix4fv(GLint location, GLsizei count, GLboolean trans
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5742,7 +5742,7 @@ void __stdcall glUseProgram(GLuint program)
context->useProgram(program);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5775,7 +5775,7 @@ void __stdcall glValidateProgram(GLuint program)
programObject->validate();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5800,7 +5800,7 @@ void __stdcall glVertexAttrib1f(GLuint index, GLfloat x)
context->setVertexAttribf(index, vals);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5825,7 +5825,7 @@ void __stdcall glVertexAttrib1fv(GLuint index, const GLfloat* values)
context->setVertexAttribf(index, vals);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5850,7 +5850,7 @@ void __stdcall glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
context->setVertexAttribf(index, vals);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5875,7 +5875,7 @@ void __stdcall glVertexAttrib2fv(GLuint index, const GLfloat* values)
context->setVertexAttribf(index, vals);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5900,7 +5900,7 @@ void __stdcall glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
context->setVertexAttribf(index, vals);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5925,7 +5925,7 @@ void __stdcall glVertexAttrib3fv(GLuint index, const GLfloat* values)
context->setVertexAttribf(index, vals);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5950,7 +5950,7 @@ void __stdcall glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z, G
context->setVertexAttribf(index, vals);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5974,7 +5974,7 @@ void __stdcall glVertexAttrib4fv(GLuint index, const GLfloat* values)
context->setVertexAttribf(index, values);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -5998,7 +5998,7 @@ void __stdcall glVertexAttribDivisorANGLE(GLuint index, GLuint divisor)
context->setVertexAttribDivisor(index, divisor);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6075,7 +6075,7 @@ void __stdcall glVertexAttribPointer(GLuint index, GLint size, GLenum type, GLbo
normalized == GL_TRUE, false, stride, ptr);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6099,7 +6099,7 @@ void __stdcall glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
context->setViewportParams(x, y, width, height);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6126,7 +6126,7 @@ void __stdcall glReadBuffer(GLenum mode)
UNIMPLEMENTED();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6152,7 +6152,7 @@ void __stdcall glDrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsize
UNIMPLEMENTED();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6204,7 +6204,7 @@ void __stdcall glTexImage3D(GLenum target, GLint level, GLint internalformat, GL
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6263,7 +6263,7 @@ void __stdcall glTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6317,7 +6317,7 @@ void __stdcall glCopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GL
texture->copySubImage(target, level, xoffset, yoffset, zoffset, x, y, width, height, framebuffer);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6374,7 +6374,7 @@ void __stdcall glCompressedTexImage3D(GLenum target, GLint level, GLenum interna
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6444,7 +6444,7 @@ void __stdcall glCompressedTexSubImage3D(GLenum target, GLint level, GLint xoffs
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6476,7 +6476,7 @@ void __stdcall glGenQueries(GLsizei n, GLuint* ids)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6508,7 +6508,7 @@ void __stdcall glDeleteQueries(GLsizei n, const GLuint* ids)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6532,7 +6532,7 @@ GLboolean __stdcall glIsQuery(GLuint id)
return (context->getQuery(id, false, GL_NONE) != NULL) ? GL_TRUE : GL_FALSE;
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -6568,7 +6568,7 @@ void __stdcall glBeginQuery(GLenum target, GLuint id)
context->beginQuery(target, id);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6597,7 +6597,7 @@ void __stdcall glEndQuery(GLenum target)
context->endQuery(target);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6634,7 +6634,7 @@ void __stdcall glGetQueryiv(GLenum target, GLenum pname, GLint* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6680,7 +6680,7 @@ void __stdcall glGetQueryObjectuiv(GLuint id, GLenum pname, GLuint* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6704,7 +6704,7 @@ GLboolean __stdcall glUnmapBuffer(GLenum target)
return glUnmapBufferOES(target);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -6730,7 +6730,7 @@ void __stdcall glGetBufferPointerv(GLenum target, GLenum pname, GLvoid** params)
glGetBufferPointervOES(target, pname, params);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6752,7 +6752,7 @@ void __stdcall glDrawBuffers(GLsizei n, const GLenum* bufs)
glDrawBuffersEXT(n, bufs);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6796,7 +6796,7 @@ void __stdcall glUniformMatrix2x3fv(GLint location, GLsizei count, GLboolean tra
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6840,7 +6840,7 @@ void __stdcall glUniformMatrix3x2fv(GLint location, GLsizei count, GLboolean tra
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6884,7 +6884,7 @@ void __stdcall glUniformMatrix2x4fv(GLint location, GLsizei count, GLboolean tra
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6928,7 +6928,7 @@ void __stdcall glUniformMatrix4x2fv(GLint location, GLsizei count, GLboolean tra
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -6972,7 +6972,7 @@ void __stdcall glUniformMatrix3x4fv(GLint location, GLsizei count, GLboolean tra
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7016,7 +7016,7 @@ void __stdcall glUniformMatrix4x3fv(GLint location, GLsizei count, GLboolean tra
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7049,7 +7049,7 @@ void __stdcall glBlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint sr
mask, filter);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7080,7 +7080,7 @@ void __stdcall glRenderbufferStorageMultisample(GLenum target, GLsizei samples,
context->setRenderbufferStorage(width, height, internalformat, samples);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7129,7 +7129,7 @@ void __stdcall glFramebufferTextureLayer(GLenum target, GLenum attachment, GLuin
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7154,7 +7154,7 @@ GLvoid* __stdcall glMapBufferRange(GLenum target, GLintptr offset, GLsizeiptr le
return glMapBufferRangeEXT(target, offset, length, access);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, reinterpret_cast<GLvoid*>(NULL));
}
......@@ -7180,7 +7180,7 @@ void __stdcall glFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeip
glFlushMappedBufferRangeEXT(target, offset, length);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7213,7 +7213,7 @@ void __stdcall glBindVertexArray(GLuint array)
context->bindVertexArray(array);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7248,7 +7248,7 @@ void __stdcall glDeleteVertexArrays(GLsizei n, const GLuint* arrays)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7280,7 +7280,7 @@ void __stdcall glGenVertexArrays(GLsizei n, GLuint* arrays)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7311,7 +7311,7 @@ GLboolean __stdcall glIsVertexArray(GLuint array)
return (vao != NULL ? GL_TRUE : GL_FALSE);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -7386,7 +7386,7 @@ void __stdcall glGetIntegeri_v(GLenum target, GLuint index, GLint* data)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7435,7 +7435,7 @@ void __stdcall glBeginTransformFeedback(GLenum primitiveMode)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7467,7 +7467,7 @@ void __stdcall glEndTransformFeedback(void)
transformFeedback->stop();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7545,7 +7545,7 @@ void __stdcall glBindBufferRange(GLenum target, GLuint index, GLuint buffer, GLi
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7604,7 +7604,7 @@ void __stdcall glBindBufferBase(GLenum target, GLuint index, GLuint buffer)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7656,7 +7656,7 @@ void __stdcall glTransformFeedbackVaryings(GLuint program, GLsizei count, const
programObject->setTransformFeedbackVaryings(count, varyings, bufferMode);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7700,7 +7700,7 @@ void __stdcall glGetTransformFeedbackVarying(GLuint program, GLuint index, GLsiz
programObject->getTransformFeedbackVarying(index, bufSize, length, size, type, name);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7773,7 +7773,7 @@ void __stdcall glVertexAttribIPointer(GLuint index, GLint size, GLenum type, GLs
stride, pointer);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7821,7 +7821,7 @@ void __stdcall glGetVertexAttribIiv(GLuint index, GLenum pname, GLint* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7869,7 +7869,7 @@ void __stdcall glGetVertexAttribIuiv(GLuint index, GLenum pname, GLuint* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7900,7 +7900,7 @@ void __stdcall glVertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint
context->setVertexAttribi(index, vals);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7931,7 +7931,7 @@ void __stdcall glVertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GL
context->setVertexAttribu(index, vals);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7960,7 +7960,7 @@ void __stdcall glVertexAttribI4iv(GLuint index, const GLint* v)
context->setVertexAttribi(index, v);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -7989,7 +7989,7 @@ void __stdcall glVertexAttribI4uiv(GLuint index, const GLuint* v)
context->setVertexAttribu(index, v);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8035,7 +8035,7 @@ void __stdcall glGetUniformuiv(GLuint program, GLint location, GLuint* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8078,7 +8078,7 @@ GLint __stdcall glGetFragDataLocation(GLuint program, const GLchar *name)
return programBinary->getFragDataLocation(name);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, 0);
}
......@@ -8137,7 +8137,7 @@ void __stdcall glUniform1uiv(GLint location, GLsizei count, const GLuint* value)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8171,7 +8171,7 @@ void __stdcall glUniform2uiv(GLint location, GLsizei count, const GLuint* value)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8205,7 +8205,7 @@ void __stdcall glUniform3uiv(GLint location, GLsizei count, const GLuint* value)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8239,7 +8239,7 @@ void __stdcall glUniform4uiv(GLint location, GLsizei count, const GLuint* value)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8282,7 +8282,7 @@ void __stdcall glClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint* val
context->clearBufferiv(buffer, drawbuffer, value);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8319,7 +8319,7 @@ void __stdcall glClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint* v
context->clearBufferuiv(buffer, drawbuffer, value);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8362,7 +8362,7 @@ void __stdcall glClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat* v
context->clearBufferfv(buffer, drawbuffer, value);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8399,7 +8399,7 @@ void __stdcall glClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, G
context->clearBufferfi(buffer, drawbuffer, depth, stencil);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8433,7 +8433,7 @@ const GLubyte* __stdcall glGetStringi(GLenum name, GLuint index)
return reinterpret_cast<const GLubyte*>(context->getExtensionString(index));
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, reinterpret_cast<GLubyte*>(NULL));
}
......@@ -8496,7 +8496,7 @@ void __stdcall glCopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintp
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8554,7 +8554,7 @@ void __stdcall glGetUniformIndices(GLuint program, GLsizei uniformCount, const G
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8634,7 +8634,7 @@ void __stdcall glGetActiveUniformsiv(GLuint program, GLsizei uniformCount, const
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8678,7 +8678,7 @@ GLuint __stdcall glGetUniformBlockIndex(GLuint program, const GLchar* uniformBlo
return programBinary->getUniformBlockIndex(uniformBlockName);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, 0);
}
......@@ -8742,7 +8742,7 @@ void __stdcall glGetActiveUniformBlockiv(GLuint program, GLuint uniformBlockInde
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8788,7 +8788,7 @@ void __stdcall glGetActiveUniformBlockName(GLuint program, GLuint uniformBlockIn
programBinary->getActiveUniformBlockName(uniformBlockIndex, bufSize, length, uniformBlockName);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8840,7 +8840,7 @@ void __stdcall glUniformBlockBinding(GLuint program, GLuint uniformBlockIndex, G
programObject->bindUniformBlock(uniformBlockIndex, uniformBlockBinding);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8866,7 +8866,7 @@ void __stdcall glDrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GL
UNIMPLEMENTED();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8892,7 +8892,7 @@ void __stdcall glDrawElementsInstanced(GLenum mode, GLsizei count, GLenum type,
UNIMPLEMENTED();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -8926,7 +8926,7 @@ GLsync __stdcall glFenceSync(GLenum condition, GLbitfield flags)
return context->createFenceSync(condition);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, reinterpret_cast<GLsync>(NULL));
}
......@@ -8952,7 +8952,7 @@ GLboolean __stdcall glIsSync(GLsync sync)
return (context->getFenceSync(sync) != NULL);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -8983,7 +8983,7 @@ void __stdcall glDeleteSync(GLsync sync)
context->deleteFenceSync(sync);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9020,7 +9020,7 @@ GLenum __stdcall glClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeou
return fenceSync->clientWait(flags, timeout);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -9064,7 +9064,7 @@ void __stdcall glWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
fenceSync->serverWait();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9105,7 +9105,7 @@ void __stdcall glGetInteger64v(GLenum pname, GLint64* params)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9151,7 +9151,7 @@ void __stdcall glGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei*
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9221,7 +9221,7 @@ void __stdcall glGetInteger64i_v(GLenum target, GLuint index, GLint64* data)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9285,7 +9285,7 @@ void __stdcall glGetBufferParameteri64v(GLenum target, GLenum pname, GLint64* pa
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9317,7 +9317,7 @@ void __stdcall glGenSamplers(GLsizei count, GLuint* samplers)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9349,7 +9349,7 @@ void __stdcall glDeleteSamplers(GLsizei count, const GLuint* samplers)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9373,7 +9373,7 @@ GLboolean __stdcall glIsSampler(GLuint sampler)
return context->isSampler(sampler);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -9409,7 +9409,7 @@ void __stdcall glBindSampler(GLuint unit, GLuint sampler)
context->bindSampler(unit, sampler);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9448,7 +9448,7 @@ void __stdcall glSamplerParameteri(GLuint sampler, GLenum pname, GLint param)
context->samplerParameteri(sampler, pname, param);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9492,7 +9492,7 @@ void __stdcall glSamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
context->samplerParameterf(sampler, pname, param);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9531,7 +9531,7 @@ void __stdcall glGetSamplerParameteriv(GLuint sampler, GLenum pname, GLint* para
*params = context->getSamplerParameteri(sampler, pname);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9565,7 +9565,7 @@ void __stdcall glGetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat* pa
*params = context->getSamplerParameterf(sampler, pname);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9594,7 +9594,7 @@ void __stdcall glVertexAttribDivisor(GLuint index, GLuint divisor)
context->setVertexAttribDivisor(index, divisor);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9641,7 +9641,7 @@ void __stdcall glBindTransformFeedback(GLenum target, GLuint id)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9668,7 +9668,7 @@ void __stdcall glDeleteTransformFeedbacks(GLsizei n, const GLuint* ids)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9695,7 +9695,7 @@ void __stdcall glGenTransformFeedbacks(GLsizei n, GLuint* ids)
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9719,7 +9719,7 @@ GLboolean __stdcall glIsTransformFeedback(GLuint id)
return ((context->getTransformFeedback(id) != NULL) ? GL_TRUE : GL_FALSE);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -9754,7 +9754,7 @@ void __stdcall glPauseTransformFeedback(void)
transformFeedback->pause();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9787,7 +9787,7 @@ void __stdcall glResumeTransformFeedback(void)
transformFeedback->resume();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9813,7 +9813,7 @@ void __stdcall glGetProgramBinary(GLuint program, GLsizei bufSize, GLsizei* leng
UNIMPLEMENTED();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9839,7 +9839,7 @@ void __stdcall glProgramBinary(GLuint program, GLenum binaryFormat, const GLvoid
UNIMPLEMENTED();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9865,7 +9865,7 @@ void __stdcall glProgramParameteri(GLuint program, GLenum pname, GLint value)
UNIMPLEMENTED();
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9896,7 +9896,7 @@ void __stdcall glInvalidateFramebuffer(GLenum target, GLsizei numAttachments, co
context->invalidateFrameBuffer(target, numAttachments, attachments, 0, 0, maxDimension, maxDimension);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9927,7 +9927,7 @@ void __stdcall glInvalidateSubFramebuffer(GLenum target, GLsizei numAttachments,
context->invalidateFrameBuffer(target, numAttachments, attachments, x, y, width, height);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -9975,7 +9975,7 @@ void __stdcall glTexStorage2D(GLenum target, GLsizei levels, GLenum internalform
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -10024,7 +10024,7 @@ void __stdcall glTexStorage3D(GLenum target, GLsizei levels, GLenum internalform
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -10078,7 +10078,7 @@ void __stdcall glGetInternalformativ(GLenum target, GLenum internalformat, GLenu
}
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -10111,7 +10111,7 @@ void __stdcall glBlitFramebufferANGLE(GLint srcX0, GLint srcY0, GLint srcX1, GLi
mask, filter);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -10129,7 +10129,7 @@ void __stdcall glTexImage3DOES(GLenum target, GLint level, GLenum internalformat
{
UNIMPLEMENTED(); // FIXME
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -10169,7 +10169,7 @@ void __stdcall glGetProgramBinaryOES(GLuint program, GLsizei bufSize, GLsizei *l
*binaryFormat = GL_PROGRAM_BINARY_ANGLE;
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -10202,7 +10202,7 @@ void __stdcall glProgramBinaryOES(GLuint program, GLenum binaryFormat,
context->setProgramBinary(program, binary, length);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -10260,7 +10260,7 @@ void __stdcall glDrawBuffersEXT(GLsizei n, const GLenum *bufs)
}
}
}
catch (std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -10301,7 +10301,7 @@ void __stdcall glGetBufferPointervOES(GLenum target, GLenum pname, void** params
*params = buffer->mapPointer();
}
}
catch (std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -10342,7 +10342,7 @@ void * __stdcall glMapBufferOES(GLenum target, GLenum access)
return buffer->mapRange(0, buffer->size(), GL_MAP_WRITE_BIT);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, reinterpret_cast<GLvoid*>(NULL));
}
......@@ -10379,7 +10379,7 @@ GLboolean __stdcall glUnmapBufferOES(GLenum target)
return GL_TRUE;
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, GL_FALSE);
}
......@@ -10466,7 +10466,7 @@ void* __stdcall glMapBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr
return buffer->mapRange(offset, length, access);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, reinterpret_cast<GLvoid*>(NULL));
}
......@@ -10519,7 +10519,7 @@ void __stdcall glFlushMappedBufferRangeEXT (GLenum target, GLintptr offset, GLsi
// We do not currently support a non-trivial implementation of FlushMappedBufferRange
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY);
}
......@@ -10605,7 +10605,7 @@ bool __stdcall glBindTexImage(egl::Surface *surface)
textureObject->bindTexImage(surface);
}
}
catch(std::bad_alloc&)
catch (...)
{
return gl::error(GL_OUT_OF_MEMORY, false);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment