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

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

Issue 2481943003: Enforce no uncleared OES external textures. Clear in AVDA, not GVD. (Closed)
Patch Set: Fix mismerge. Created 4 years, 1 month 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
« no previous file with comments | « no previous file | media/gpu/avda_picture_buffer_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <limits.h> 7 #include <limits.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 #include <stdio.h> 10 #include <stdio.h>
(...skipping 12165 matching lines...) Expand 10 before | Expand all | Expand 10 after
12176 12176
12177 bool GLES2DecoderImpl::ClearLevel(Texture* texture, 12177 bool GLES2DecoderImpl::ClearLevel(Texture* texture,
12178 unsigned target, 12178 unsigned target,
12179 int level, 12179 int level,
12180 unsigned format, 12180 unsigned format,
12181 unsigned type, 12181 unsigned type,
12182 int xoffset, 12182 int xoffset,
12183 int yoffset, 12183 int yoffset,
12184 int width, 12184 int width,
12185 int height) { 12185 int height) {
12186 DCHECK(target != GL_TEXTURE_3D && target != GL_TEXTURE_2D_ARRAY); 12186 DCHECK(target != GL_TEXTURE_3D && target != GL_TEXTURE_2D_ARRAY &&
12187 target != GL_TEXTURE_EXTERNAL_OES);
12187 uint32_t channels = GLES2Util::GetChannelsForFormat(format); 12188 uint32_t channels = GLES2Util::GetChannelsForFormat(format);
12188 if ((feature_info_->feature_flags().angle_depth_texture || 12189 if ((feature_info_->feature_flags().angle_depth_texture ||
12189 feature_info_->IsWebGL2OrES3Context()) 12190 feature_info_->IsWebGL2OrES3Context())
12190 && (channels & GLES2Util::kDepth) != 0) { 12191 && (channels & GLES2Util::kDepth) != 0) {
12191 // It's a depth format and ANGLE doesn't allow texImage2D or texSubImage2D 12192 // It's a depth format and ANGLE doesn't allow texImage2D or texSubImage2D
12192 // on depth formats. 12193 // on depth formats.
12193 GLuint fb = 0; 12194 GLuint fb = 0;
12194 glGenFramebuffersEXT(1, &fb); 12195 glGenFramebuffersEXT(1, &fb);
12195 glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, fb); 12196 glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, fb);
12196 12197
(...skipping 6599 matching lines...) Expand 10 before | Expand all | Expand 10 after
18796 } 18797 }
18797 18798
18798 // Include the auto-generated part of this file. We split this because it means 18799 // Include the auto-generated part of this file. We split this because it means
18799 // we can easily edit the non-auto generated parts right here in this file 18800 // we can easily edit the non-auto generated parts right here in this file
18800 // instead of having to edit some template or the code generator. 18801 // instead of having to edit some template or the code generator.
18801 #include "base/macros.h" 18802 #include "base/macros.h"
18802 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 18803 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
18803 18804
18804 } // namespace gles2 18805 } // namespace gles2
18805 } // namespace gpu 18806 } // namespace gpu
OLDNEW
« no previous file with comments | « no previous file | media/gpu/avda_picture_buffer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698