Skip to content

A
angle
Commit 0be9a8a0 by Jamie Madill
Options

No-op BufferSubData after validation.

We were skipping some validation, which was confusing dEQP. We can still no-op, but do this after all validation. BUG=angleproject:901 Change-Id: I9888c1aca851519e9c7da210c983ba6012e95932 Reviewed-on: https://chromium-review.googlesource.com/266926Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarBrandon Jones <bajones@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent a7441353
Showing with 5 additions and 5 deletions
src/libGLESv2/entry_points_gles_2_0.cpp
...@@ -537,11 +537,6 @@ void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, ...@@ -537,11 +537,6 @@ void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size,
return; return;
} }
if (data == NULL)
{
return;
}
if (!ValidBufferTarget(context, target)) if (!ValidBufferTarget(context, target))
{ {
context->recordError(Error(GL_INVALID_ENUM)); context->recordError(Error(GL_INVALID_ENUM));
...@@ -575,6 +570,11 @@ void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, ...@@ -575,6 +570,11 @@ void GL_APIENTRY BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size,
return; return;
} }
if (data == NULL)
{
return;
}
Error error = buffer->bufferSubData(data, size, offset); Error error = buffer->bufferSubData(data, size, offset);
if (error.isError()) if (error.isError())
{ {
......
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