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

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

Issue 2460973002: gpu, cmaa: reuse CopyTextureCHROMIUMResourceManager (Closed)
Patch Set: revert unrelated change 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
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 16893 matching lines...) Expand 10 before | Expand all | Expand 10 after
16904 LOCAL_COPY_REAL_GL_ERRORS_TO_WRAPPER( 16904 LOCAL_COPY_REAL_GL_ERRORS_TO_WRAPPER(
16905 "glApplyFramebufferAttachmentCMAAINTEL"); 16905 "glApplyFramebufferAttachmentCMAAINTEL");
16906 apply_framebuffer_attachment_cmaa_intel_.reset( 16906 apply_framebuffer_attachment_cmaa_intel_.reset(
16907 new ApplyFramebufferAttachmentCMAAINTELResourceManager()); 16907 new ApplyFramebufferAttachmentCMAAINTELResourceManager());
16908 apply_framebuffer_attachment_cmaa_intel_->Initialize(this); 16908 apply_framebuffer_attachment_cmaa_intel_->Initialize(this);
16909 RestoreCurrentFramebufferBindings(); 16909 RestoreCurrentFramebufferBindings();
16910 if (LOCAL_PEEK_GL_ERROR("glApplyFramebufferAttachmentCMAAINTEL") != 16910 if (LOCAL_PEEK_GL_ERROR("glApplyFramebufferAttachmentCMAAINTEL") !=
16911 GL_NO_ERROR) 16911 GL_NO_ERROR)
16912 return; 16912 return;
16913 } 16913 }
16914 static const char kFunctionName[] =
16915 "glApplyScreenSpaceAntialiasingCHROMIUM";
16916 if (!InitializeCopyTextureCHROMIUM(kFunctionName))
16917 return;
16914 apply_framebuffer_attachment_cmaa_intel_ 16918 apply_framebuffer_attachment_cmaa_intel_
16915 ->ApplyFramebufferAttachmentCMAAINTEL(this, bound_framebuffer); 16919 ->ApplyFramebufferAttachmentCMAAINTEL(this, bound_framebuffer,
16920 copy_texture_CHROMIUM_.get());
16916 } 16921 }
16917 } 16922 }
16918 16923
16919 void GLES2DecoderImpl::DoInsertEventMarkerEXT( 16924 void GLES2DecoderImpl::DoInsertEventMarkerEXT(
16920 GLsizei length, const GLchar* marker) { 16925 GLsizei length, const GLchar* marker) {
16921 if (!marker) { 16926 if (!marker) {
16922 marker = ""; 16927 marker = "";
16923 } 16928 }
16924 debug_marker_manager_.SetMarker( 16929 debug_marker_manager_.SetMarker(
16925 length ? std::string(marker, length) : std::string(marker)); 16930 length ? std::string(marker, length) : std::string(marker));
(...skipping 1843 matching lines...) Expand 10 before | Expand all | Expand 10 after
18769 } 18774 }
18770 18775
18771 // Include the auto-generated part of this file. We split this because it means 18776 // Include the auto-generated part of this file. We split this because it means
18772 // we can easily edit the non-auto generated parts right here in this file 18777 // we can easily edit the non-auto generated parts right here in this file
18773 // instead of having to edit some template or the code generator. 18778 // instead of having to edit some template or the code generator.
18774 #include "base/macros.h" 18779 #include "base/macros.h"
18775 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 18780 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
18776 18781
18777 } // namespace gles2 18782 } // namespace gles2
18778 } // namespace gpu 18783 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698