| Index: gpu/command_buffer/client/gles2_implementation.cc
|
| diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
|
| index 59385241e5c89526420ceda1fd8c50d75fc050b1..99678462c542e675ff57e3a090b447b2040c3919 100644
|
| --- a/gpu/command_buffer/client/gles2_implementation.cc
|
| +++ b/gpu/command_buffer/client/gles2_implementation.cc
|
| @@ -4713,10 +4713,11 @@ bool ValidImageUsage(GLenum usage) {
|
|
|
| } // namespace
|
|
|
| -GLuint GLES2Implementation::CreateImageCHROMIUMHelper(ClientBuffer buffer,
|
| - GLsizei width,
|
| - GLsizei height,
|
| - GLenum internalformat) {
|
| +GLuint GLES2Implementation::CreateImageCHROMIUMHelper(
|
| + ClientBuffer* const buffers,
|
| + GLsizei width,
|
| + GLsizei height,
|
| + GLenum internalformat) {
|
| if (width <= 0) {
|
| SetGLError(GL_INVALID_VALUE, "glCreateImageCHROMIUM", "width <= 0");
|
| return 0;
|
| @@ -4728,12 +4729,12 @@ GLuint GLES2Implementation::CreateImageCHROMIUMHelper(ClientBuffer buffer,
|
| }
|
|
|
| if (!ValidImageFormat(internalformat)) {
|
| - SetGLError(GL_INVALID_VALUE, "glCreateImageCHROMIUM", "invalid format");
|
| + SetGLError(GL_INVALID_ENUM, "glCreateImageCHROMIUM", "invalid format");
|
| return 0;
|
| }
|
|
|
| int32_t image_id =
|
| - gpu_control_->CreateImage(buffer, width, height, internalformat);
|
| + gpu_control_->CreateImage(buffers, width, height, internalformat);
|
| if (image_id < 0) {
|
| SetGLError(GL_OUT_OF_MEMORY, "glCreateImageCHROMIUM", "image_id < 0");
|
| return 0;
|
| @@ -4741,17 +4742,18 @@ GLuint GLES2Implementation::CreateImageCHROMIUMHelper(ClientBuffer buffer,
|
| return image_id;
|
| }
|
|
|
| -GLuint GLES2Implementation::CreateImageCHROMIUM(ClientBuffer buffer,
|
| - GLsizei width,
|
| - GLsizei height,
|
| - GLenum internalformat) {
|
| +GLuint GLES2Implementation::CreateImageCHROMIUM(
|
| + ClientBuffer* buffers,
|
| + GLsizei width,
|
| + GLsizei height,
|
| + GLenum internalformat) {
|
| GPU_CLIENT_SINGLE_THREAD_CHECK();
|
| GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glCreateImageCHROMIUM(" << width
|
| << ", " << height << ", "
|
| << GLES2Util::GetStringImageInternalFormat(internalformat)
|
| << ")");
|
| GLuint image_id =
|
| - CreateImageCHROMIUMHelper(buffer, width, height, internalformat);
|
| + CreateImageCHROMIUMHelper(buffers, width, height, internalformat);
|
| CheckGLError();
|
| return image_id;
|
| }
|
|
|