Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(300)

Unified Diff: gpu/command_buffer/client/gles2_implementation.cc

Issue 962723002: Change CHROMIUM_image declarations to support multi planar input. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reveman@ comments. Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;
}

Powered by Google App Engine
This is Rietveld 408576698