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

Unified Diff: gpu/command_buffer/service/framebuffer_manager.h

Issue 1231273002: Fix framebuffer completeness ES3 behavior. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add unittest Created 5 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/context_group.cc ('k') | gpu/command_buffer/service/framebuffer_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/framebuffer_manager.h
diff --git a/gpu/command_buffer/service/framebuffer_manager.h b/gpu/command_buffer/service/framebuffer_manager.h
index 75f7e2a7ec605d652e312720d06449cd372cb4cc..172125403d6420ad6aee31b856ddf224e2110d69 100644
--- a/gpu/command_buffer/service/framebuffer_manager.h
+++ b/gpu/command_buffer/service/framebuffer_manager.h
@@ -11,6 +11,7 @@
#include "base/containers/hash_tables.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
+#include "gpu/command_buffer/service/context_group.h"
#include "gpu/command_buffer/service/gl_utils.h"
#include "gpu/gpu_export.h"
@@ -240,7 +241,8 @@ class GPU_EXPORT FramebufferManager {
DISALLOW_COPY_AND_ASSIGN(TextureDetachObserver);
};
- FramebufferManager(uint32 max_draw_buffers, uint32 max_color_attachments);
+ FramebufferManager(uint32 max_draw_buffers, uint32 max_color_attachments,
+ ContextGroup::ContextType context_type);
~FramebufferManager();
// Must call before destruction.
@@ -285,6 +287,10 @@ class GPU_EXPORT FramebufferManager {
texture_detach_observers_.end());
}
+ ContextGroup::ContextType context_type() const {
+ return context_type_;
+ }
+
private:
friend class Framebuffer;
@@ -311,6 +317,8 @@ class GPU_EXPORT FramebufferManager {
uint32 max_draw_buffers_;
uint32 max_color_attachments_;
+ ContextGroup::ContextType context_type_;
+
typedef std::vector<TextureDetachObserver*> TextureDetachObserverVector;
TextureDetachObserverVector texture_detach_observers_;
« no previous file with comments | « gpu/command_buffer/service/context_group.cc ('k') | gpu/command_buffer/service/framebuffer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698