OLD | NEW |
---|---|
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #ifndef CC_OUTPUT_OUTPUT_SURFACE_H_ | 5 #ifndef CC_OUTPUT_OUTPUT_SURFACE_H_ |
6 #define CC_OUTPUT_OUTPUT_SURFACE_H_ | 6 #define CC_OUTPUT_OUTPUT_SURFACE_H_ |
7 | 7 |
8 #include <deque> | 8 #include <deque> |
9 #include <memory> | 9 #include <memory> |
10 | 10 |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
53 scoped_refptr<ContextProvider> worker_context_provider, | 53 scoped_refptr<ContextProvider> worker_context_provider, |
54 #if defined(ENABLE_VULKAN) | 54 #if defined(ENABLE_VULKAN) |
55 scoped_refptr<VulkanContextProvider> vulkan_context_provider, | 55 scoped_refptr<VulkanContextProvider> vulkan_context_provider, |
56 #endif | 56 #endif |
57 std::unique_ptr<SoftwareOutputDevice> software_device); | 57 std::unique_ptr<SoftwareOutputDevice> software_device); |
58 OutputSurface(scoped_refptr<ContextProvider> context_provider, | 58 OutputSurface(scoped_refptr<ContextProvider> context_provider, |
59 scoped_refptr<ContextProvider> worker_context_provider); | 59 scoped_refptr<ContextProvider> worker_context_provider); |
60 explicit OutputSurface(scoped_refptr<ContextProvider> context_provider); | 60 explicit OutputSurface(scoped_refptr<ContextProvider> context_provider); |
61 #if defined(ENABLE_VULKAN) | 61 #if defined(ENABLE_VULKAN) |
62 explicit OutputSurface( | 62 explicit OutputSurface( |
63 scoped_refptr<VulkanContextProvider> vulkan_context_provider); | 63 scoped_refptr<VulkanContextProvider> vulkan_context_provider, |
64 bool use_vulkan); | |
piman
2016/04/19 01:36:42
What's the reason for use_vulkan, it's not used ex
David Yen
2016/04/19 22:20:27
This was so I could override the constructor, it c
piman
2016/04/19 23:29:57
I think you're running into a scoped_refptr limita
| |
64 #endif | 65 #endif |
65 explicit OutputSurface(std::unique_ptr<SoftwareOutputDevice> software_device); | 66 explicit OutputSurface(std::unique_ptr<SoftwareOutputDevice> software_device); |
66 | 67 |
67 OutputSurface(scoped_refptr<ContextProvider> context_provider, | 68 OutputSurface(scoped_refptr<ContextProvider> context_provider, |
68 std::unique_ptr<SoftwareOutputDevice> software_device); | 69 std::unique_ptr<SoftwareOutputDevice> software_device); |
69 | 70 |
70 ~OutputSurface() override; | 71 ~OutputSurface() override; |
71 | 72 |
72 struct Capabilities { | 73 struct Capabilities { |
73 Capabilities() | 74 Capabilities() |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
208 bool external_stencil_test_enabled_; | 209 bool external_stencil_test_enabled_; |
209 | 210 |
210 base::WeakPtrFactory<OutputSurface> weak_ptr_factory_; | 211 base::WeakPtrFactory<OutputSurface> weak_ptr_factory_; |
211 | 212 |
212 DISALLOW_COPY_AND_ASSIGN(OutputSurface); | 213 DISALLOW_COPY_AND_ASSIGN(OutputSurface); |
213 }; | 214 }; |
214 | 215 |
215 } // namespace cc | 216 } // namespace cc |
216 | 217 |
217 #endif // CC_OUTPUT_OUTPUT_SURFACE_H_ | 218 #endif // CC_OUTPUT_OUTPUT_SURFACE_H_ |
OLD | NEW |