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

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

Issue 1534623002: Mac CoreAnimation: Add more CALayer parameters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix windows compile Created 5 years 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 587a5db07d5513758a194ac285f3bd7f0a1d1620..0110716e2789e5a892e0a499ed15c2ca7f625a8d 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -4438,9 +4438,13 @@ void GLES2Implementation::ScheduleCALayerCHROMIUM(GLuint contents_texture_id,
const GLfloat* contents_rect,
GLfloat opacity,
GLuint background_color,
- const GLfloat* bounds_size,
+ GLuint edge_aa_mask,
+ const GLfloat* bounds_rect,
+ GLboolean is_clipped,
+ const GLfloat* clip_rect,
+ GLint sorting_context_id,
const GLfloat* transform) {
- size_t shm_size = 22 * sizeof(GLfloat);
+ size_t shm_size = 28 * sizeof(GLfloat);
ScopedTransferBufferPtr buffer(shm_size, helper_, transfer_buffer_);
if (!buffer.valid() || buffer.size() < shm_size) {
SetGLError(GL_OUT_OF_MEMORY, "GLES2::ScheduleCALayerCHROMIUM",
@@ -4449,10 +4453,12 @@ void GLES2Implementation::ScheduleCALayerCHROMIUM(GLuint contents_texture_id,
}
GLfloat* mem = static_cast<GLfloat*>(buffer.address());
memcpy(mem + 0, contents_rect, 4 * sizeof(GLfloat));
- memcpy(mem + 4, bounds_size, 2 * sizeof(GLfloat));
- memcpy(mem + 6, transform, 16 * sizeof(GLfloat));
+ memcpy(mem + 4, bounds_rect, 4 * sizeof(GLfloat));
+ memcpy(mem + 8, clip_rect, 4 * sizeof(GLfloat));
+ memcpy(mem + 12, transform, 16 * sizeof(GLfloat));
helper_->ScheduleCALayerCHROMIUM(contents_texture_id, opacity,
- background_color, buffer.shm_id(),
+ background_color, edge_aa_mask, is_clipped,
+ sorting_context_id, buffer.shm_id(),
buffer.offset());
}
« no previous file with comments | « gpu/command_buffer/client/gles2_cmd_helper_autogen.h ('k') | gpu/command_buffer/client/gles2_implementation_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698