Commit f32c007a authored by kbr's avatar kbr Committed by Commit bot

Remove obsolete getBufferSubData compatibility entry points.

BUG=639145, 649250
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel;master.tryserver.chromium.android:android_optional_gpu_tests_rel
NOTRY=true

Review-Url: https://codereview.chromium.org/2360353002
Cr-Commit-Position: refs/heads/master@{#420706}
parent b3e6014f
...@@ -39,7 +39,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations): ...@@ -39,7 +39,6 @@ class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
self.Fail('conformance2/textures/misc/tex-srgb-mipmap.html', bug=634519) self.Fail('conformance2/textures/misc/tex-srgb-mipmap.html', bug=634519)
# All platforms. # All platforms.
self.Fail('conformance2/buffers/getBufferSubData.html', bug=649250)
self.Fail('conformance2/rendering/blitframebuffer-outside-readbuffer.html', self.Fail('conformance2/rendering/blitframebuffer-outside-readbuffer.html',
bug=664740) bug=664740)
self.Flaky('conformance2/query/occlusion-query.html', bug=603168) self.Flaky('conformance2/query/occlusion-query.html', bug=603168)
......
...@@ -330,34 +330,6 @@ void WebGL2RenderingContextBase::getBufferSubData(GLenum target, long long srcBy ...@@ -330,34 +330,6 @@ void WebGL2RenderingContextBase::getBufferSubData(GLenum target, long long srcBy
contextGL()->UnmapBuffer(target); contextGL()->UnmapBuffer(target);
} }
void WebGL2RenderingContextBase::getBufferSubData(GLenum target, long long srcByteOffset, DOMArrayBuffer* dstData)
{
const char* funcName = "getBufferSubData";
if (isContextLost())
return;
if (!dstData) {
synthesizeGLError(GL_INVALID_VALUE, funcName, "ArrayBuffer can not be null");
return;
}
if (!validateValueFitNonNegInt32(funcName, "srcByteOffset", srcByteOffset)) {
return;
}
WebGLBuffer* buffer = validateBufferDataTarget(funcName, target);
if (!buffer)
return;
if (srcByteOffset + dstData->byteLength() > buffer->getSize()) {
synthesizeGLError(GL_INVALID_VALUE, funcName, "buffer overflow");
return;
}
void* mappedData = contextGL()->MapBufferRange(target, static_cast<GLintptr>(srcByteOffset), dstData->byteLength(), GL_MAP_READ_BIT);
if (!mappedData)
return;
memcpy(dstData->data(), mappedData, dstData->byteLength());
contextGL()->UnmapBuffer(target);
}
void WebGL2RenderingContextBase::blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) void WebGL2RenderingContextBase::blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
{ {
if (isContextLost()) if (isContextLost())
......
...@@ -40,8 +40,6 @@ public: ...@@ -40,8 +40,6 @@ public:
void copyBufferSubData(GLenum, GLenum, long long, long long, long long); void copyBufferSubData(GLenum, GLenum, long long, long long, long long);
void getBufferSubData(GLenum, long long, DOMArrayBufferView*, GLuint, GLuint); void getBufferSubData(GLenum, long long, DOMArrayBufferView*, GLuint, GLuint);
// TODO(zmo): Obsolete, remove after WebGL2 conformance tests are updated.
void getBufferSubData(GLenum, long long, DOMArrayBuffer*);
/* Framebuffer objects */ /* Framebuffer objects */
bool validateTexFuncLayer(const char*, GLenum texTarget, GLint layer); bool validateTexFuncLayer(const char*, GLenum texTarget, GLint layer);
......
...@@ -292,8 +292,6 @@ typedef long long GLint64; ...@@ -292,8 +292,6 @@ typedef long long GLint64;
void bufferSubData(GLenum target, GLintptr dstByteOffset, ArrayBufferView srcData, GLuint srcOffset, optional GLuint length = 0); void bufferSubData(GLenum target, GLintptr dstByteOffset, ArrayBufferView srcData, GLuint srcOffset, optional GLuint length = 0);
void copyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); void copyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
void getBufferSubData(GLenum target, GLintptr srcByteOffset, ArrayBufferView dstData, optional GLuint dstOffset = 0, optional GLuint length = 0); void getBufferSubData(GLenum target, GLintptr srcByteOffset, ArrayBufferView dstData, optional GLuint dstOffset = 0, optional GLuint length = 0);
// TODO(zmo): Obsolete, remove after WebGL2 conformance tests are updated.
void getBufferSubData(GLenum target, GLintptr srcByteOffset, ArrayBuffer? dstData);
/* Framebuffer objects */ /* Framebuffer objects */
void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); void blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
......
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