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 74e79efdcae08934069e5c31190a05b50005179e..b4a8346a129dd6bb51d823f02a26151bd3883f2f 100644 |
--- a/gpu/command_buffer/client/gles2_implementation.cc |
+++ b/gpu/command_buffer/client/gles2_implementation.cc |
@@ -4789,10 +4789,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; |
@@ -4804,12 +4805,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; |
@@ -4817,17 +4818,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; |
} |