Skip to content

S
swiftshader
Commit 6c4564af by Nicolas Capens Committed by Nicolas Capens
Options

Add missing break in switch.

Also replace some extension enums with core ones. Bug chromium:805881 Change-Id: I80a9b658fb8dda9c759c4d79b89fbe71b8b91ae1 Reviewed-on: https://swiftshader-review.googlesource.com/16728Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com>
parent c715a8ec
Showing with 18 additions and 17 deletions
src/OpenGL/libGLESv2/Context.cpp
......@@ -1932,8 +1932,8 @@ template<typename T> bool Context::getIntegerv(GLenum pname, T *params) const
case GL_ARRAY_BUFFER_BINDING: *params = getArrayBufferName(); return true;
case GL_ELEMENT_ARRAY_BUFFER_BINDING: *params = getElementArrayBufferName(); return true;
// case GL_FRAMEBUFFER_BINDING: // now equivalent to GL_DRAW_FRAMEBUFFER_BINDING_ANGLE
case GL_DRAW_FRAMEBUFFER_BINDING_ANGLE: *params = mState.drawFramebuffer; return true;
case GL_READ_FRAMEBUFFER_BINDING_ANGLE: *params = mState.readFramebuffer; return true;
case GL_DRAW_FRAMEBUFFER_BINDING: *params = mState.drawFramebuffer; return true;
case GL_READ_FRAMEBUFFER_BINDING: *params = mState.readFramebuffer; return true;
case GL_RENDERBUFFER_BINDING: *params = mState.renderbuffer.name(); return true;
case GL_CURRENT_PROGRAM: *params = mState.currentProgram; return true;
case GL_PACK_ALIGNMENT: *params = mState.packAlignment; return true;
......@@ -1968,7 +1968,7 @@ template<typename T> bool Context::getIntegerv(GLenum pname, T *params) const
case GL_MAX_TEXTURE_SIZE: *params = IMPLEMENTATION_MAX_TEXTURE_SIZE; return true;
case GL_MAX_CUBE_MAP_TEXTURE_SIZE: *params = IMPLEMENTATION_MAX_CUBE_MAP_TEXTURE_SIZE; return true;
case GL_NUM_COMPRESSED_TEXTURE_FORMATS: *params = NUM_COMPRESSED_TEXTURE_FORMATS; return true;
case GL_MAX_SAMPLES_ANGLE: *params = IMPLEMENTATION_MAX_SAMPLES; return true;
case GL_MAX_SAMPLES: *params = IMPLEMENTATION_MAX_SAMPLES; return true;
case GL_SAMPLE_BUFFERS:
case GL_SAMPLES:
{
......@@ -2491,8 +2491,8 @@ bool Context::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *nu
case GL_NUM_SHADER_BINARY_FORMATS:
case GL_NUM_COMPRESSED_TEXTURE_FORMATS:
case GL_ARRAY_BUFFER_BINDING:
case GL_FRAMEBUFFER_BINDING: // Same as GL_DRAW_FRAMEBUFFER_BINDING_ANGLE
case GL_READ_FRAMEBUFFER_BINDING_ANGLE:
case GL_FRAMEBUFFER_BINDING: // Same as GL_DRAW_FRAMEBUFFER_BINDING_ANGLE
case GL_READ_FRAMEBUFFER_BINDING: // Same as GL_READ_FRAMEBUFFER_BINDING_ANGLE
case GL_RENDERBUFFER_BINDING:
case GL_CURRENT_PROGRAM:
case GL_PACK_ALIGNMENT:
......@@ -2617,7 +2617,7 @@ bool Context::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *nu
*numParams = 1;
}
break;
case GL_MAX_SAMPLES_ANGLE:
case GL_MAX_SAMPLES:
{
*type = GL_INT;
*numParams = 1;
......
src/OpenGL/libGLESv2/libGLESv2.cpp
......@@ -309,7 +309,7 @@ void BindFramebuffer(GLenum target, GLuint framebuffer)
{
TRACE("(GLenum target = 0x%X, GLuint framebuffer = %d)", target, framebuffer);
if(target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER_ANGLE && target != GL_READ_FRAMEBUFFER_ANGLE)
if(target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER && target != GL_READ_FRAMEBUFFER)
{
return error(GL_INVALID_ENUM);
}
......@@ -318,12 +318,12 @@ void BindFramebuffer(GLenum target, GLuint framebuffer)
if(context)
{
if(target == GL_READ_FRAMEBUFFER_ANGLE || target == GL_FRAMEBUFFER)
if(target == GL_READ_FRAMEBUFFER || target == GL_FRAMEBUFFER)
{
context->bindReadFramebuffer(framebuffer);
}
if(target == GL_DRAW_FRAMEBUFFER_ANGLE || target == GL_FRAMEBUFFER)
if(target == GL_DRAW_FRAMEBUFFER || target == GL_FRAMEBUFFER)
{
context->bindDrawFramebuffer(framebuffer);
}
......@@ -670,7 +670,7 @@ GLenum CheckFramebufferStatus(GLenum target)
{
TRACE("(GLenum target = 0x%X)", target);
if(target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER_ANGLE && target != GL_READ_FRAMEBUFFER_ANGLE)
if(target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER && target != GL_READ_FRAMEBUFFER)
{
return error(GL_INVALID_ENUM, 0);
}
......@@ -680,7 +680,7 @@ GLenum CheckFramebufferStatus(GLenum target)
if(context)
{
es2::Framebuffer *framebuffer = nullptr;
if(target == GL_READ_FRAMEBUFFER_ANGLE)
if(target == GL_READ_FRAMEBUFFER)
{
framebuffer = context->getReadFramebuffer();
}
......@@ -1958,7 +1958,7 @@ void FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuff
TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum renderbuffertarget = 0x%X, "
"GLuint renderbuffer = %d)", target, attachment, renderbuffertarget, renderbuffer);
if((target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER_ANGLE && target != GL_READ_FRAMEBUFFER_ANGLE) ||
if((target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER && target != GL_READ_FRAMEBUFFER) ||
(renderbuffertarget != GL_RENDERBUFFER && renderbuffer != 0))
{
return error(GL_INVALID_ENUM);
......@@ -1970,7 +1970,7 @@ void FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuff
{
es2::Framebuffer *framebuffer = nullptr;
GLuint framebufferName = 0;
if(target == GL_READ_FRAMEBUFFER_ANGLE)
if(target == GL_READ_FRAMEBUFFER)
{
framebuffer = context->getReadFramebuffer();
framebufferName = context->getReadFramebufferName();
......@@ -2065,7 +2065,7 @@ void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GL
TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, "
"GLuint texture = %d, GLint level = %d)", target, attachment, textarget, texture, level);
if(target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER_ANGLE && target != GL_READ_FRAMEBUFFER_ANGLE)
if(target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER && target != GL_READ_FRAMEBUFFER)
{
return error(GL_INVALID_ENUM);
}
......@@ -2130,7 +2130,7 @@ void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GL
es2::Framebuffer *framebuffer = nullptr;
GLuint framebufferName = 0;
if(target == GL_READ_FRAMEBUFFER_ANGLE)
if(target == GL_READ_FRAMEBUFFER)
{
framebuffer = context->getReadFramebuffer();
framebufferName = context->getReadFramebufferName();
......@@ -6546,7 +6546,7 @@ void FramebufferTexture3DOES(GLenum target, GLenum attachment, GLenum textarget,
TRACE("(GLenum target = 0x%X, GLenum attachment = 0x%X, GLenum textarget = 0x%X, "
"GLuint texture = %d, GLint level = %d, GLint zoffset = %d)", target, attachment, textarget, texture, level, zoffset);
if(target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER_ANGLE && target != GL_READ_FRAMEBUFFER_ANGLE)
if(target != GL_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER && target != GL_READ_FRAMEBUFFER)
{
return error(GL_INVALID_ENUM);
}
......@@ -6593,7 +6593,7 @@ void FramebufferTexture3DOES(GLenum target, GLenum attachment, GLenum textarget,
es2::Framebuffer *framebuffer = nullptr;
GLuint framebufferName = 0;
if(target == GL_READ_FRAMEBUFFER_ANGLE)
if(target == GL_READ_FRAMEBUFFER)
{
framebuffer = context->getReadFramebuffer();
framebufferName = context->getReadFramebufferName();
......
src/OpenGL/libGLESv2/libGLESv3.cpp
......@@ -3860,6 +3860,7 @@ GL_APICALL void GL_APIENTRY glInvalidateSubFramebuffer(GLenum target, GLsizei nu
case GL_DRAW_FRAMEBUFFER:
case GL_FRAMEBUFFER:
framebuffer = context->getDrawFramebuffer();
break;
case GL_READ_FRAMEBUFFER:
framebuffer = context->getReadFramebuffer();
break;
......
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