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

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

Issue 25277005: Move more framebuffer state out of ContextState and into FramebufferState. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased onto head, in the hope this fix errors unrelated to my change. Created 7 years, 2 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) 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/framebuffer_manager.h" 5 #include "gpu/command_buffer/service/framebuffer_manager.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 8 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
9 #include "gpu/command_buffer/service/renderbuffer_manager.h" 9 #include "gpu/command_buffer/service/renderbuffer_manager.h"
10 #include "gpu/command_buffer/service/texture_manager.h" 10 #include "gpu/command_buffer/service/texture_manager.h"
11 #include "ui/gl/gl_bindings.h" 11 #include "ui/gl/gl_bindings.h"
12 12
13 namespace gpu { 13 namespace gpu {
14 namespace gles2 { 14 namespace gles2 {
15 15
16 DecoderFramebufferState::DecoderFramebufferState()
17 : clear_state_dirty(false),
18 bound_read_framebuffer(NULL),
19 bound_draw_framebuffer(NULL) {
20 }
21
22 DecoderFramebufferState::~DecoderFramebufferState() {
23 }
24
16 Framebuffer::FramebufferComboCompleteMap* 25 Framebuffer::FramebufferComboCompleteMap*
17 Framebuffer::framebuffer_combo_complete_map_; 26 Framebuffer::framebuffer_combo_complete_map_;
18 27
19 // Framebuffer completeness is not cacheable on OS X because of dynamic 28 // Framebuffer completeness is not cacheable on OS X because of dynamic
20 // graphics switching. 29 // graphics switching.
21 // http://crbug.com/180876 30 // http://crbug.com/180876
22 #if defined(OS_MACOSX) 31 #if defined(OS_MACOSX)
23 bool Framebuffer::allow_framebuffer_combo_complete_map_ = false; 32 bool Framebuffer::allow_framebuffer_combo_complete_map_ = false;
24 #else 33 #else
25 bool Framebuffer::allow_framebuffer_combo_complete_map_ = true; 34 bool Framebuffer::allow_framebuffer_combo_complete_map_ = true;
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 Framebuffer* framebuffer) { 618 Framebuffer* framebuffer) {
610 DCHECK(framebuffer); 619 DCHECK(framebuffer);
611 return framebuffer->framebuffer_complete_state_count_id() == 620 return framebuffer->framebuffer_complete_state_count_id() ==
612 framebuffer_state_change_count_; 621 framebuffer_state_change_count_;
613 } 622 }
614 623
615 } // namespace gles2 624 } // namespace gles2
616 } // namespace gpu 625 } // namespace gpu
617 626
618 627
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/framebuffer_manager.h ('k') | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698