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

Side by Side Diff: cc/trees/layer_tree_host_impl.cc

Issue 198703002: Add GL_TEXTURE_EXTERNAL_OES as supported texture target for CHROMIUM_map_image. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mac build break Created 6 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
« no previous file with comments | « no previous file | ui/gl/gl_image_egl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 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 "cc/trees/layer_tree_host_impl.h" 5 #include "cc/trees/layer_tree_host_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <limits> 8 #include <limits>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 // equal here, as this is ideal when using transfer buffers. When not using 102 // equal here, as this is ideal when using transfer buffers. When not using
103 // transfer buffers we should still limit raster to something similar, to 103 // transfer buffers we should still limit raster to something similar, to
104 // preserve caching behavior (and limit memory waste when priorities change). 104 // preserve caching behavior (and limit memory waste when priorities change).
105 return GetMaxTransferBufferUsageBytes(context_provider); 105 return GetMaxTransferBufferUsageBytes(context_provider);
106 } 106 }
107 107
108 unsigned GetMapImageTextureTarget(cc::ContextProvider* context_provider) { 108 unsigned GetMapImageTextureTarget(cc::ContextProvider* context_provider) {
109 if (!context_provider) 109 if (!context_provider)
110 return GL_TEXTURE_2D; 110 return GL_TEXTURE_2D;
111 111
112 // TODO(reveman): Determine if GL_TEXTURE_EXTERNAL_OES works well on
113 // Android before we enable this. crbug.com/322780
114 #if !defined(OS_ANDROID)
115 if (context_provider->ContextCapabilities().gpu.egl_image_external) 112 if (context_provider->ContextCapabilities().gpu.egl_image_external)
116 return GL_TEXTURE_EXTERNAL_OES; 113 return GL_TEXTURE_EXTERNAL_OES;
117 if (context_provider->ContextCapabilities().gpu.texture_rectangle) 114 if (context_provider->ContextCapabilities().gpu.texture_rectangle)
118 return GL_TEXTURE_RECTANGLE_ARB; 115 return GL_TEXTURE_RECTANGLE_ARB;
119 #endif
120 116
121 return GL_TEXTURE_2D; 117 return GL_TEXTURE_2D;
122 } 118 }
123 119
124 } // namespace 120 } // namespace
125 121
126 namespace cc { 122 namespace cc {
127 123
128 class LayerTreeHostImplTimeSourceAdapter : public TimeSourceClient { 124 class LayerTreeHostImplTimeSourceAdapter : public TimeSourceClient {
129 public: 125 public:
(...skipping 2890 matching lines...) Expand 10 before | Expand all | Expand 10 after
3020 swap_promise_monitor_.erase(monitor); 3016 swap_promise_monitor_.erase(monitor);
3021 } 3017 }
3022 3018
3023 void LayerTreeHostImpl::NotifySwapPromiseMonitorsOfSetNeedsRedraw() { 3019 void LayerTreeHostImpl::NotifySwapPromiseMonitorsOfSetNeedsRedraw() {
3024 std::set<SwapPromiseMonitor*>::iterator it = swap_promise_monitor_.begin(); 3020 std::set<SwapPromiseMonitor*>::iterator it = swap_promise_monitor_.begin();
3025 for (; it != swap_promise_monitor_.end(); it++) 3021 for (; it != swap_promise_monitor_.end(); it++)
3026 (*it)->OnSetNeedsRedrawOnImpl(); 3022 (*it)->OnSetNeedsRedrawOnImpl();
3027 } 3023 }
3028 3024
3029 } // namespace cc 3025 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | ui/gl/gl_image_egl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698