Skip to content

A
angle
Commit 023a290e by Jamie Madill
Options

Revert "Add GL_OES_vertex_array_object to D3D11 and GL renderers"

This is failing the WebGL 2 test: WebglConformance.conformance2_state_gl_get_calls http://build.chromium.org/p/chromium.gpu.fyi/builders/Win8%20Debug%20%28NVIDIA%29/builds/9807 Also the dEQP-GLES3 tests: dEQP-GLES3.functional.state_query.integers.unpack_skip_images_get* BUG=angleproject:1186 This reverts commit eb36e275. Change-Id: If903c471f4610ac0b33a268df42f3329d672f429 Reviewed-on: https://chromium-review.googlesource.com/308460Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent bb7740cc
Showing with 58 additions and 305 deletions
src/libANGLE/Caps.cpp
......@@ -141,8 +141,7 @@ Extensions::Extensions()
eglImageExternalEssl3(false),
unpackSubimage(false),
packSubimage(false),
colorBufferFloat(false),
vertexArrayObject(false)
colorBufferFloat(false)
{
}
......@@ -202,7 +201,6 @@ std::vector<std::string> Extensions::getStrings() const
InsertExtensionString("GL_EXT_unpack_subimage", unpackSubimage, &extensionStrings);
InsertExtensionString("GL_NV_pack_subimage", packSubimage, &extensionStrings);
InsertExtensionString("GL_EXT_color_buffer_float", colorBufferFloat, &extensionStrings);
InsertExtensionString("GL_OES_vertex_array_object", vertexArrayObject, &extensionStrings);
// clang-format on
return extensionStrings;
......
src/libANGLE/Caps.h
......@@ -239,9 +239,6 @@ struct Extensions
// NV_pack_subimage
bool packSubimage;
// GL_OES_vertex_array_object
bool vertexArrayObject;
// ES3 Extension support
// GL_EXT_color_buffer_float
......
src/libANGLE/Context.cpp
......@@ -1107,6 +1107,26 @@ bool Context::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *nu
}
}
return true;
case GL_PACK_ROW_LENGTH:
case GL_PACK_SKIP_ROWS:
case GL_PACK_SKIP_PIXELS:
if ((mClientVersion < 3) && !mExtensions.packSubimage)
{
return false;
}
*type = GL_INT;
*numParams = 1;
return true;
case GL_UNPACK_ROW_LENGTH:
case GL_UNPACK_SKIP_ROWS:
case GL_UNPACK_SKIP_PIXELS:
if ((mClientVersion < 3) && !mExtensions.unpackSubimage)
{
return false;
}
*type = GL_INT;
*numParams = 1;
return true;
case GL_MAX_VIEWPORT_DIMS:
{
*type = GL_INT;
......@@ -1179,39 +1199,6 @@ bool Context::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *nu
return true;
}
// Check for ES3.0+ parameter names which are also exposed as ES2 extensions
switch (pname)
{
case GL_PACK_ROW_LENGTH:
case GL_PACK_SKIP_ROWS:
case GL_PACK_SKIP_PIXELS:
if ((mClientVersion < 3) && !mExtensions.packSubimage)
{
return false;
}
*type = GL_INT;
*numParams = 1;
return true;
case GL_UNPACK_ROW_LENGTH:
case GL_UNPACK_SKIP_ROWS:
case GL_UNPACK_SKIP_PIXELS:
if ((mClientVersion < 3) && !mExtensions.unpackSubimage)
{
return false;
}
*type = GL_INT;
*numParams = 1;
return true;
case GL_VERTEX_ARRAY_BINDING:
if ((mClientVersion < 3) && !mExtensions.vertexArrayObject)
{
return false;
}
*type = GL_INT;
*numParams = 1;
return true;
}
if (mClientVersion < 3)
{
return false;
......@@ -1237,6 +1224,7 @@ bool Context::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *nu
case GL_MAX_VERTEX_OUTPUT_COMPONENTS:
case GL_MAX_FRAGMENT_INPUT_COMPONENTS:
case GL_MAX_VARYING_COMPONENTS:
case GL_VERTEX_ARRAY_BINDING:
case GL_MAX_VERTEX_UNIFORM_COMPONENTS:
case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS:
case GL_MIN_PROGRAM_TEXEL_OFFSET:
......@@ -1249,8 +1237,14 @@ bool Context::getQueryParameterInfo(GLenum pname, GLenum *type, unsigned int *nu
case GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS:
case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS:
case GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS:
case GL_PACK_ROW_LENGTH:
case GL_PACK_SKIP_ROWS:
case GL_PACK_SKIP_PIXELS:
case GL_UNPACK_ROW_LENGTH:
case GL_UNPACK_IMAGE_HEIGHT:
case GL_UNPACK_SKIP_IMAGES:
case GL_UNPACK_SKIP_ROWS:
case GL_UNPACK_SKIP_PIXELS:
{
*type = GL_INT;
*numParams = 1;
......
src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
......@@ -1215,7 +1215,6 @@ void GenerateCaps(ID3D11Device *device, ID3D11DeviceContext *deviceContext, cons
extensions->eglImage = true;
extensions->unpackSubimage = true;
extensions->packSubimage = true;
extensions->vertexArrayObject = true;
// D3D11 Feature Level 10_0+ uses SV_IsFrontFace in HLSL to emulate gl_FrontFacing.
// D3D11 Feature Level 9_3 doesn't support SV_IsFrontFace, and has no equivalent, so can't support gl_FrontFacing.
......
src/libANGLE/renderer/d3d/d3d9/renderer9_utils.cpp
......@@ -576,7 +576,6 @@ void GenerateCaps(IDirect3D9 *d3d9,
extensions->eglImage = true;
extensions->unpackSubimage = true;
extensions->packSubimage = true;
extensions->vertexArrayObject = true;
// D3D9 has no concept of separate masks and refs for front and back faces in the depth stencil
// state.
......
src/libANGLE/renderer/gl/renderergl_utils.cpp
......@@ -578,9 +578,6 @@ void GenerateCaps(const FunctionsGL *functions, gl::Caps *caps, gl::TextureCapsM
extensions->debugMarker =
functions->isAtLeastGL(gl::Version(4, 3)) || functions->hasGLExtension("GL_KHR_debug") ||
functions->isAtLeastGLES(gl::Version(3, 2)) || functions->hasGLESExtension("GL_KHR_debug");
// ANGLE emulates vertex array objects in its GL layer
extensions->vertexArrayObject = true;
}
void GenerateWorkarounds(const FunctionsGL *functions, WorkaroundsGL *workarounds)
......
src/libANGLE/validationES.cpp
......@@ -2173,41 +2173,4 @@ bool ValidateEGLImageTargetRenderbufferStorageOES(Context *context,
return true;
}
bool ValidateBindVertexArrayBase(Context *context, GLuint array)
{
VertexArray *vao = context->getVertexArray(array);
if (!vao)
{
// The default VAO should always exist
ASSERT(array != 0);
context->recordError(Error(GL_INVALID_OPERATION));
return false;
}
return true;
}
bool ValidateDeleteVertexArraysBase(Context *context, GLsizei n)
{
if (n < 0)
{
context->recordError(Error(GL_INVALID_VALUE));
return false;
}
return true;
}
bool ValidateGenVertexArraysBase(Context *context, GLsizei n)
{
if (n < 0)
{
context->recordError(Error(GL_INVALID_VALUE));
return false;
}
return true;
}
}
src/libANGLE/validationES.h
......@@ -141,10 +141,6 @@ bool ValidateEGLImageTargetRenderbufferStorageOES(Context *context,
egl::Display *display,
GLenum target,
egl::Image *image);
bool ValidateBindVertexArrayBase(Context *context, GLuint array);
bool ValidateDeleteVertexArraysBase(Context *context, GLsizei n);
bool ValidateGenVertexArraysBase(Context *context, GLsizei n);
}
#endif // LIBANGLE_VALIDATION_ES_H_
src/libANGLE/validationES2.cpp
......@@ -993,48 +993,4 @@ bool ValidateDrawBuffers(Context *context, GLsizei n, const GLenum *bufs)
return true;
}
bool ValidateBindVertexArrayOES(Context *context, GLuint array)
{
if (!context->getExtensions().vertexArrayObject)
{
context->recordError(Error(GL_INVALID_OPERATION, "Extension not enabled"));
return false;
}
return ValidateBindVertexArrayBase(context, array);
}
bool ValidateDeleteVertexArraysOES(Context *context, GLsizei n)
{
if (!context->getExtensions().vertexArrayObject)
{
context->recordError(Error(GL_INVALID_OPERATION, "Extension not enabled"));
return false;
}
return ValidateDeleteVertexArraysBase(context, n);
}
bool ValidateGenVertexArraysOES(Context *context, GLsizei n)
{
if (!context->getExtensions().vertexArrayObject)
{
context->recordError(Error(GL_INVALID_OPERATION, "Extension not enabled"));
return false;
}
return ValidateGenVertexArraysBase(context, n);
}
bool ValidateIsVertexArrayOES(Context *context)
{
if (!context->getExtensions().vertexArrayObject)
{
context->recordError(Error(GL_INVALID_OPERATION, "Extension not enabled"));
return false;
}
return true;
}
}
src/libANGLE/validationES2.h
......@@ -33,11 +33,6 @@ bool ValidateDiscardFramebufferEXT(Context *context, GLenum target, GLsizei numA
const GLenum *attachments);
bool ValidateDrawBuffers(Context *context, GLsizei n, const GLenum *bufs);
bool ValidateBindVertexArrayOES(Context *context, GLuint array);
bool ValidateDeleteVertexArraysOES(Context *context, GLsizei n);
bool ValidateGenVertexArraysOES(Context *context, GLsizei n);
bool ValidateIsVertexArrayOES(Context *context);
}
#endif // LIBANGLE_VALIDATION_ES2_H_
src/libANGLE/validationES3.cpp
......@@ -1299,48 +1299,4 @@ bool ValidateCompressedTexImage3D(Context *context,
return true;
}
bool ValidateBindVertexArray(Context *context, GLuint array)
{
if (context->getClientVersion() < 3)
{
context->recordError(Error(GL_INVALID_OPERATION));
return false;
}
return ValidateBindVertexArrayBase(context, array);
}
bool ValidateDeleteVertexArrays(Context *context, GLsizei n)
{
if (context->getClientVersion() < 3)
{
context->recordError(Error(GL_INVALID_OPERATION));
return false;
}
return ValidateDeleteVertexArraysBase(context, n);
}
bool ValidateGenVertexArrays(Context *context, GLsizei n)
{
if (context->getClientVersion() < 3)
{
context->recordError(Error(GL_INVALID_OPERATION));
return false;
}
return ValidateGenVertexArraysBase(context, n);
}
bool ValidateIsVertexArray(Context *context)
{
if (context->getClientVersion() < 3)
{
context->recordError(Error(GL_INVALID_OPERATION));
return false;
}
return true;
}
}
src/libANGLE/validationES3.h
......@@ -54,11 +54,6 @@ bool ValidateCompressedTexImage3D(Context *context,
GLint border,
GLsizei imageSize,
const GLvoid *data);
bool ValidateBindVertexArray(Context *context, GLuint array);
bool ValidateDeleteVertexArrays(Context *context, GLsizei n);
bool ValidateGenVertexArrays(Context *context, GLsizei n);
bool ValidateIsVertexArray(Context *context);
}
#endif // LIBANGLE_VALIDATION_ES3_H_
src/libGLESv2/entry_points_egl.cpp
......@@ -1341,12 +1341,6 @@ __eglMustCastToProperFunctionPointerType EGLAPIENTRY GetProcAddress(const char *
INSERT_PROC_ADDRESS(gl, EGLImageTargetTexture2DOES);
INSERT_PROC_ADDRESS(gl, EGLImageTargetRenderbufferStorageOES);
// GL_OES_vertex_array_object
INSERT_PROC_ADDRESS(gl, BindVertexArrayOES);
INSERT_PROC_ADDRESS(gl, DeleteVertexArraysOES);
INSERT_PROC_ADDRESS(gl, GenVertexArraysOES);
INSERT_PROC_ADDRESS(gl, IsVertexArrayOES);
// GLES3 core
INSERT_PROC_ADDRESS(gl, ReadBuffer);
INSERT_PROC_ADDRESS(gl, DrawRangeElements);
......
src/libGLESv2/entry_points_gles_2_0_ext.cpp
......@@ -1202,86 +1202,4 @@ ANGLE_EXPORT void GL_APIENTRY EGLImageTargetRenderbufferStorageOES(GLenum target
}
}
}
void GL_APIENTRY BindVertexArrayOES(GLuint array)
{
EVENT("(GLuint array = %u)", array);
Context *context = GetValidGlobalContext();
if (context)
{
if (!ValidateBindVertexArrayOES(context, array))
{
return;
}
context->bindVertexArray(array);
}
}
void GL_APIENTRY DeleteVertexArraysOES(GLsizei n, const GLuint *arrays)
{
EVENT("(GLsizei n = %d, const GLuint* arrays = 0x%0.8p)", n, arrays);
Context *context = GetValidGlobalContext();
if (context)
{
if (!ValidateDeleteVertexArraysOES(context, n))
{
return;
}
for (int arrayIndex = 0; arrayIndex < n; arrayIndex++)
{
if (arrays[arrayIndex] != 0)
{
context->deleteVertexArray(arrays[arrayIndex]);
}
}
}
}
void GL_APIENTRY GenVertexArraysOES(GLsizei n, GLuint *arrays)
{
EVENT("(GLsizei n = %d, GLuint* arrays = 0x%0.8p)", n, arrays);
Context *context = GetValidGlobalContext();
if (context)
{
if (!ValidateGenVertexArraysOES(context, n))
{
return;
}
for (int arrayIndex = 0; arrayIndex < n; arrayIndex++)
{
arrays[arrayIndex] = context->createVertexArray();
}
}
}
GLboolean GL_APIENTRY IsVertexArrayOES(GLuint array)
{
EVENT("(GLuint array = %u)", array);
Context *context = GetValidGlobalContext();
if (context)
{
if (!ValidateIsVertexArrayOES(context))
{
return GL_FALSE;
}
if (array == 0)
{
return GL_FALSE;
}
VertexArray *vao = context->getVertexArray(array);
return (vao != nullptr ? GL_TRUE : GL_FALSE);
}
return GL_FALSE;
}
}
src/libGLESv2/entry_points_gles_2_0_ext.h
......@@ -85,12 +85,6 @@ ANGLE_EXPORT void GL_APIENTRY PopGroupMarkerEXT();
ANGLE_EXPORT void GL_APIENTRY EGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image);
ANGLE_EXPORT void GL_APIENTRY EGLImageTargetRenderbufferStorageOES(GLenum target,
GLeglImageOES image);
// GL_OES_vertex_array_object
ANGLE_EXPORT void GL_APIENTRY BindVertexArrayOES(GLuint array);
ANGLE_EXPORT void GL_APIENTRY DeleteVertexArraysOES(GLsizei n, const GLuint *arrays);
ANGLE_EXPORT void GL_APIENTRY GenVertexArraysOES(GLsizei n, GLuint *arrays);
ANGLE_EXPORT GLboolean GL_APIENTRY IsVertexArrayOES(GLuint array);
}
#endif // LIBGLESV2_ENTRYPOINTGLES20EXT_H_
src/libGLESv2/entry_points_gles_3_0.cpp
......@@ -806,8 +806,19 @@ void GL_APIENTRY BindVertexArray(GLuint array)
Context *context = GetValidGlobalContext();
if (context)
{
if (!ValidateBindVertexArray(context, array))
if (context->getClientVersion() < 3)
{
context->recordError(Error(GL_INVALID_OPERATION));
return;
}
VertexArray *vao = context->getVertexArray(array);
if (!vao)
{
// The default VAO should always exist
ASSERT(array != 0);
context->recordError(Error(GL_INVALID_OPERATION));
return;
}
......@@ -822,8 +833,15 @@ void GL_APIENTRY DeleteVertexArrays(GLsizei n, const GLuint* arrays)
Context *context = GetValidGlobalContext();
if (context)
{
if (!ValidateDeleteVertexArrays(context, n))
if (context->getClientVersion() < 3)
{
context->recordError(Error(GL_INVALID_OPERATION));
return;
}
if (n < 0)
{
context->recordError(Error(GL_INVALID_VALUE));
return;
}
......@@ -844,8 +862,15 @@ void GL_APIENTRY GenVertexArrays(GLsizei n, GLuint* arrays)
Context *context = GetValidGlobalContext();
if (context)
{
if (!ValidateGenVertexArrays(context, n))
if (context->getClientVersion() < 3)
{
context->recordError(Error(GL_INVALID_OPERATION));
return;
}
if (n < 0)
{
context->recordError(Error(GL_INVALID_VALUE));
return;
}
......@@ -863,8 +888,9 @@ GLboolean GL_APIENTRY IsVertexArray(GLuint array)
Context *context = GetValidGlobalContext();
if (context)
{
if (!ValidateIsVertexArray(context))
if (context->getClientVersion() < 3)
{
context->recordError(Error(GL_INVALID_OPERATION));
return GL_FALSE;
}
......
src/libGLESv2/libGLESv2.cpp
......@@ -1439,24 +1439,4 @@ void GL_APIENTRY glEGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImag
{
return gl::EGLImageTargetRenderbufferStorageOES(target, image);
}
void GL_APIENTRY glBindVertexArrayOES(GLuint array)
{
return gl::BindVertexArrayOES(array);
}
void GL_APIENTRY glDeleteVertexArraysOES(GLsizei n, const GLuint *arrays)
{
return gl::DeleteVertexArraysOES(n, arrays);
}
void GL_APIENTRY glGenVertexArraysOES(GLsizei n, GLuint *arrays)
{
return gl::GenVertexArraysOES(n, arrays);
}
GLboolean GL_APIENTRY glIsVertexArrayOES(GLuint array)
{
return gl::IsVertexArrayOES(array);
}
}
src/libGLESv2/libGLESv2.def
......@@ -183,10 +183,6 @@ EXPORTS
glPopGroupMarkerEXT @296
glEGLImageTargetTexture2DOES @297
glEGLImageTargetRenderbufferStorageOES @298
glBindVertexArrayOES @299
glDeleteVertexArraysOES @300
glGenVertexArraysOES @301
glIsVertexArrayOES @302
; GLES 3.0 Functions
glReadBuffer @180
......
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