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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 415283002: ui: Add ScheduleOverlayPlane API to GLImage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android build fix Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include <stdio.h> 7 #include <stdio.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <list> 10 #include <list>
(...skipping 7635 matching lines...) Expand 10 before | Expand all | Expand 10 after
7646 "unsupported texture format"); 7646 "unsupported texture format");
7647 return error::kNoError; 7647 return error::kNoError;
7648 } 7648 }
7649 gfx::OverlayTransform transform = GetGFXOverlayTransform(c.plane_transform); 7649 gfx::OverlayTransform transform = GetGFXOverlayTransform(c.plane_transform);
7650 if (transform == gfx::OVERLAY_TRANSFORM_INVALID) { 7650 if (transform == gfx::OVERLAY_TRANSFORM_INVALID) {
7651 LOCAL_SET_GL_ERROR(GL_INVALID_ENUM, 7651 LOCAL_SET_GL_ERROR(GL_INVALID_ENUM,
7652 "glScheduleOverlayPlaneCHROMIUM", 7652 "glScheduleOverlayPlaneCHROMIUM",
7653 "invalid transform enum"); 7653 "invalid transform enum");
7654 return error::kNoError; 7654 return error::kNoError;
7655 } 7655 }
7656 if (!surface_->ScheduleOverlayPlane( 7656 if (!image->ScheduleOverlayPlane(
7657 c.plane_z_order, 7657 c.plane_z_order,
7658 transform, 7658 transform,
7659 image,
7660 gfx::Rect(c.bounds_x, c.bounds_y, c.bounds_width, c.bounds_height), 7659 gfx::Rect(c.bounds_x, c.bounds_y, c.bounds_width, c.bounds_height),
7661 gfx::RectF(c.uv_x, c.uv_y, c.uv_width, c.uv_height))) { 7660 gfx::RectF(c.uv_x, c.uv_y, c.uv_width, c.uv_height))) {
7662 LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, 7661 LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION,
7663 "glScheduleOverlayPlaneCHROMIUM", 7662 "glScheduleOverlayPlaneCHROMIUM",
7664 "failed to schedule overlay"); 7663 "failed to schedule overlay");
7665 } 7664 }
7666 return error::kNoError; 7665 return error::kNoError;
7667 } 7666 }
7668 7667
7669 error::Error GLES2DecoderImpl::GetAttribLocationHelper( 7668 error::Error GLES2DecoderImpl::GetAttribLocationHelper(
(...skipping 3249 matching lines...) Expand 10 before | Expand all | Expand 10 after
10919 } 10918 }
10920 } 10919 }
10921 10920
10922 // Include the auto-generated part of this file. We split this because it means 10921 // Include the auto-generated part of this file. We split this because it means
10923 // we can easily edit the non-auto generated parts right here in this file 10922 // we can easily edit the non-auto generated parts right here in this file
10924 // instead of having to edit some template or the code generator. 10923 // instead of having to edit some template or the code generator.
10925 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 10924 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
10926 10925
10927 } // namespace gles2 10926 } // namespace gles2
10928 } // namespace gpu 10927 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698