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
diff --git a/src/libGLESv2/libGLESv2.cpp b/src/libGLESv2/libGLESv2.cpp
index ae7bb6c..434514f 100644
--- a/src/libGLESv2/libGLESv2.cpp
+++ b/src/libGLESv2/libGLESv2.cpp
@@ -3203,6 +3203,16 @@
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 @@
}
*params = (GLint)texture->getMaxAnisotropy();
break;
+
default:
return gl::error(GL_INVALID_ENUM);
}
@@ -6002,6 +6013,21 @@
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 @@
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 @@
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);
}