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

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 14806005: Merge 199256 "gpu: Make sure external texture destination is ini..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1500/src/
Patch Set: Created 7 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
===================================================================
--- gpu/command_buffer/service/gles2_cmd_decoder.cc (revision 199692)
+++ gpu/command_buffer/service/gles2_cmd_decoder.cc (working copy)
@@ -9705,7 +9705,15 @@
// Set source texture's width and height to be the same as
// destination texture when source is GL_TEXTURE_EXTERNAL_OES.
+ // TODO(hkuang): Add support to get width/height of StreamTexture
+ // crbug.com/225781.
if (source_texture->target() == GL_TEXTURE_EXTERNAL_OES) {
+ if (!dest_level_defined) {
+ LOCAL_SET_GL_ERROR(
+ GL_INVALID_VALUE,
+ "glCopyTextureCHROMIUM", "destination level not defined");
+ return;
+ }
source_width = dest_width;
source_height = dest_height;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698