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

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

Issue 6724004: Take the ANGLE path for glRenderbufferStorageMultisample when on ANGLE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 9 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
« no previous file with comments | « no previous file | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 3604 matching lines...) Expand 10 before | Expand all | Expand 10 after
3615 case GL_RGB5_A1: 3615 case GL_RGB5_A1:
3616 impl_format = GL_RGBA; 3616 impl_format = GL_RGBA;
3617 break; 3617 break;
3618 case GL_RGB565: 3618 case GL_RGB565:
3619 impl_format = GL_RGB; 3619 impl_format = GL_RGB;
3620 break; 3620 break;
3621 } 3621 }
3622 } 3622 }
3623 3623
3624 CopyRealGLErrorsToWrapper(); 3624 CopyRealGLErrorsToWrapper();
3625 glRenderbufferStorageMultisampleEXT( 3625 if (IsAngle()) {
3626 target, samples, impl_format, width, height); 3626 glRenderbufferStorageMultisampleANGLE(
3627 target, samples, impl_format, width, height);
3628 } else {
3629 glRenderbufferStorageMultisampleEXT(
3630 target, samples, impl_format, width, height);
3631 }
twiz 2011/03/22 21:58:17 Are there other instances where similiar changes w
3627 GLenum error = glGetError(); 3632 GLenum error = glGetError();
3628 if (error == GL_NO_ERROR) { 3633 if (error == GL_NO_ERROR) {
3629 bound_renderbuffer_->SetInfo(samples, internalformat, width, height); 3634 bound_renderbuffer_->SetInfo(samples, internalformat, width, height);
3630 } 3635 }
3631 } 3636 }
3632 3637
3633 void GLES2DecoderImpl::DoRenderbufferStorage( 3638 void GLES2DecoderImpl::DoRenderbufferStorage(
3634 GLenum target, GLenum internalformat, GLsizei width, GLsizei height) { 3639 GLenum target, GLenum internalformat, GLsizei width, GLsizei height) {
3635 if (!bound_renderbuffer_) { 3640 if (!bound_renderbuffer_) {
3636 SetGLError(GL_INVALID_OPERATION, 3641 SetGLError(GL_INVALID_OPERATION,
(...skipping 2611 matching lines...) Expand 10 before | Expand all | Expand 10 after
6248 return error::kNoError; 6253 return error::kNoError;
6249 } 6254 }
6250 6255
6251 // Include the auto-generated part of this file. We split this because it means 6256 // Include the auto-generated part of this file. We split this because it means
6252 // we can easily edit the non-auto generated parts right here in this file 6257 // we can easily edit the non-auto generated parts right here in this file
6253 // instead of having to edit some template or the code generator. 6258 // instead of having to edit some template or the code generator.
6254 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 6259 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
6255 6260
6256 } // namespace gles2 6261 } // namespace gles2
6257 } // namespace gpu 6262 } // namespace gpu
OLDNEW
« 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