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

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

Issue 2831733003: Fix blits from multisampled renderbuffers to alpha:false WebGL back buffer. (Closed)
Patch Set: Preemptively rebased. Created 3 years, 8 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
OLDNEW
1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2016 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_passthrough.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder_passthrough.h"
6 6
7 #include "base/strings/string_number_conversions.h" 7 #include "base/strings/string_number_conversions.h"
8 #include "ui/gl/gl_version_info.h" 8 #include "ui/gl/gl_version_info.h"
9 9
10 namespace gpu { 10 namespace gpu {
(...skipping 3471 matching lines...) Expand 10 before | Expand all | Expand 10 after
3482 GLint location, 3482 GLint location,
3483 const char* name) { 3483 const char* name) {
3484 glBindUniformLocationCHROMIUM(GetProgramServiceID(program, resources_), 3484 glBindUniformLocationCHROMIUM(GetProgramServiceID(program, resources_),
3485 location, name); 3485 location, name);
3486 return error::kNoError; 3486 return error::kNoError;
3487 } 3487 }
3488 3488
3489 error::Error GLES2DecoderPassthroughImpl::DoBindTexImage2DCHROMIUM( 3489 error::Error GLES2DecoderPassthroughImpl::DoBindTexImage2DCHROMIUM(
3490 GLenum target, 3490 GLenum target,
3491 GLint imageId) { 3491 GLint imageId) {
3492 if (target != GL_TEXTURE_2D) { 3492 return BindTexImage2DCHROMIUMImpl(target, 0, imageId);
3493 InsertError(GL_INVALID_ENUM, "Invalid target"); 3493 }
3494 return error::kNoError;
3495 }
3496 3494
3497 gl::GLImage* image = image_manager_->LookupImage(imageId); 3495 error::Error
3498 if (image == nullptr) { 3496 GLES2DecoderPassthroughImpl::DoBindTexImage2DWithInternalformatCHROMIUM(
3499 InsertError(GL_INVALID_OPERATION, "No image found with the given ID"); 3497 GLenum target,
3500 return error::kNoError; 3498 GLenum internalformat,
3501 } 3499 GLint imageId) {
3502 3500 return BindTexImage2DCHROMIUMImpl(target, internalformat, imageId);
3503 if (!image->BindTexImage(target)) {
3504 image->CopyTexImage(target);
3505 }
3506
3507 return error::kNoError;
3508 } 3501 }
3509 3502
3510 error::Error GLES2DecoderPassthroughImpl::DoReleaseTexImage2DCHROMIUM( 3503 error::Error GLES2DecoderPassthroughImpl::DoReleaseTexImage2DCHROMIUM(
3511 GLenum target, 3504 GLenum target,
3512 GLint imageId) { 3505 GLint imageId) {
3513 if (target != GL_TEXTURE_2D) { 3506 if (target != GL_TEXTURE_2D) {
3514 InsertError(GL_INVALID_ENUM, "Invalid target"); 3507 InsertError(GL_INVALID_ENUM, "Invalid target");
3515 return error::kNoError; 3508 return error::kNoError;
3516 } 3509 }
3517 3510
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
3984 } 3977 }
3985 3978
3986 error::Error GLES2DecoderPassthroughImpl::DoSetEnableDCLayersCHROMIUM( 3979 error::Error GLES2DecoderPassthroughImpl::DoSetEnableDCLayersCHROMIUM(
3987 GLboolean enable) { 3980 GLboolean enable) {
3988 NOTIMPLEMENTED(); 3981 NOTIMPLEMENTED();
3989 return error::kNoError; 3982 return error::kNoError;
3990 } 3983 }
3991 3984
3992 } // namespace gles2 3985 } // namespace gles2
3993 } // namespace gpu 3986 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698