Skip to content

A
angle
Commit abf14cc3 by shannonwoods@chromium.org
Options

Add several cases to API entry points to handle enum values that dEQP uses to reset state.

The support for these methods is incomplete and unimplemented, but will not return INVALID_ENUM. TRAC #23089 Signed-off-by: Nicolas Capens Signed-off-by: Shannon Woods Author: Jamie Madill git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2408 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 7d9f7bea
Showing with 54 additions and 0 deletions
src/libGLESv2/Context.cpp
......@@ -1375,6 +1375,7 @@ bool Context::getBooleanv(GLenum pname, GLboolean *params)
case GL_BLEND: *params = mState.blend.blend; break;
case GL_DITHER: *params = mState.blend.dither; break;
case GL_CONTEXT_ROBUST_ACCESS_EXT: *params = mRobustAccess ? GL_TRUE : GL_FALSE; break;
case GL_TRANSFORM_FEEDBACK_ACTIVE: *params = GL_FALSE; UNIMPLEMENTED(); break;
default:
return false;
}
......@@ -1515,6 +1516,7 @@ bool Context::getIntegerv(GLenum pname, GLint *params)
case GL_MAX_VERTEX_UNIFORM_BLOCKS: *params = mRenderer->getMaxVertexShaderUniformBuffers(); break;
case GL_MAX_FRAGMENT_UNIFORM_BLOCKS: *params = mRenderer->getMaxFragmentShaderUniformBuffers(); break;
case GL_MAX_COMBINED_UNIFORM_BLOCKS: *params = getMaximumCombinedUniformBufferBindings(); break;
case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS: *params = 0; UNIMPLEMENTED(); break;
case GL_NUM_COMPRESSED_TEXTURE_FORMATS:
params[0] = mNumCompressedTextureFormats;
break;
......
src/libGLESv2/libGLESv2.cpp
......@@ -3203,6 +3203,16 @@ void __stdcall glDisable(GLenum cap)
case GL_DEPTH_TEST: context->setDepthTest(false); break;
case GL_BLEND: context->setBlend(false); break;
case GL_DITHER: context->setDither(false); break;
case GL_PRIMITIVE_RESTART_FIXED_INDEX:
case GL_RASTERIZER_DISCARD:
if (context->getClientVersion() < 3)
{
return gl::error(GL_INVALID_ENUM);
}
UNIMPLEMENTED();
break;
default:
return gl::error(GL_INVALID_ENUM);
}
......@@ -5251,6 +5261,7 @@ void __stdcall glGetTexParameteriv(GLenum target, GLenum pname, GLint* params)
}
*params = (GLint)texture->getMaxAnisotropy();
break;
default:
return gl::error(GL_INVALID_ENUM);
}
......@@ -6002,6 +6013,21 @@ void __stdcall glPixelStorei(GLenum pname, GLint param)
context->setPackReverseRowOrder(param != 0);
break;
case GL_UNPACK_IMAGE_HEIGHT:
case GL_UNPACK_SKIP_IMAGES:
case GL_UNPACK_ROW_LENGTH:
case GL_UNPACK_SKIP_ROWS:
case GL_UNPACK_SKIP_PIXELS:
case GL_PACK_ROW_LENGTH:
case GL_PACK_SKIP_ROWS:
case GL_PACK_SKIP_PIXELS:
if (context->getClientVersion() < 3)
{
return gl::error(GL_INVALID_ENUM);
}
UNIMPLEMENTED();
break;
default:
return gl::error(GL_INVALID_ENUM);
}
......@@ -6733,6 +6759,16 @@ void __stdcall glTexParameterf(GLenum target, GLenum pname, GLfloat param)
return gl::error(GL_INVALID_VALUE);
}
break;
case GL_TEXTURE_MIN_LOD:
case GL_TEXTURE_MAX_LOD:
if (context->getClientVersion() < 3)
{
return gl::error(GL_INVALID_ENUM);
}
UNIMPLEMENTED();
break;
default:
return gl::error(GL_INVALID_ENUM);
}
......@@ -6835,6 +6871,22 @@ void __stdcall glTexParameteri(GLenum target, GLenum pname, GLint param)
return gl::error(GL_INVALID_VALUE);
}
break;
case GL_TEXTURE_SWIZZLE_R:
case GL_TEXTURE_SWIZZLE_G:
case GL_TEXTURE_SWIZZLE_B:
case GL_TEXTURE_SWIZZLE_A:
case GL_TEXTURE_BASE_LEVEL:
case GL_TEXTURE_MAX_LEVEL:
case GL_TEXTURE_COMPARE_MODE:
case GL_TEXTURE_COMPARE_FUNC:
if (context->getClientVersion() < 3)
{
return gl::error(GL_INVALID_ENUM);
}
UNIMPLEMENTED();
break;
default:
return gl::error(GL_INVALID_ENUM);
}
......
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