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

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

Issue 2163493002: Break glScheduleCALayerCHROMIUM into smaller functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@temp37_cleanup_calayeroverlay
Patch Set: Comments from piman. Created 4 years, 5 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 6b8dba2040289360a69e73f99f99e2c806bbe324..b9af8ad6545f1e542969fd3f97149b082ed84ab6 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -4713,18 +4713,34 @@ void GLES2Implementation::ScheduleOverlayPlane(
uv_rect.height());
}
+void GLES2Implementation::ScheduleCALayerSharedStateCHROMIUM(
+ GLfloat opacity,
+ GLboolean is_clipped,
+ const GLfloat* clip_rect,
+ GLint sorting_context_id,
+ const GLfloat* transform) {
+ size_t shm_size = 20 * sizeof(GLfloat);
+ ScopedTransferBufferPtr buffer(shm_size, helper_, transfer_buffer_);
+ if (!buffer.valid() || buffer.size() < shm_size) {
+ SetGLError(GL_OUT_OF_MEMORY, "GLES2::ScheduleCALayerSharedStateCHROMIUM",
+ "out of memory");
+ return;
+ }
+ GLfloat* mem = static_cast<GLfloat*>(buffer.address());
+ memcpy(mem + 0, clip_rect, 4 * sizeof(GLfloat));
+ memcpy(mem + 4, transform, 16 * sizeof(GLfloat));
+ helper_->ScheduleCALayerSharedStateCHROMIUM(opacity, is_clipped,
+ sorting_context_id,
+ buffer.shm_id(), buffer.offset());
+}
+
void GLES2Implementation::ScheduleCALayerCHROMIUM(GLuint contents_texture_id,
const GLfloat* contents_rect,
- GLfloat opacity,
GLuint background_color,
GLuint edge_aa_mask,
const GLfloat* bounds_rect,
- GLboolean is_clipped,
- const GLfloat* clip_rect,
- GLint sorting_context_id,
- const GLfloat* transform,
GLuint filter) {
- size_t shm_size = 28 * sizeof(GLfloat);
+ size_t shm_size = 8 * sizeof(GLfloat);
ScopedTransferBufferPtr buffer(shm_size, helper_, transfer_buffer_);
if (!buffer.valid() || buffer.size() < shm_size) {
SetGLError(GL_OUT_OF_MEMORY, "GLES2::ScheduleCALayerCHROMIUM",
@@ -4734,11 +4750,8 @@ 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_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, edge_aa_mask, is_clipped,
- sorting_context_id, filter, buffer.shm_id(),
+ helper_->ScheduleCALayerCHROMIUM(contents_texture_id, background_color,
+ edge_aa_mask, filter, 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