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

Side by Side Diff: gpu/command_buffer/tests/gl_manager.h

Issue 1885903002: Revert of Make lost context and error message callbacks on GpuControl go to client (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 #ifndef GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_ 5 #ifndef GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
6 #define GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_ 6 #define GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 return gles2_implementation_.get(); 115 return gles2_implementation_.get();
116 } 116 }
117 117
118 gfx::GLContext* context() { 118 gfx::GLContext* context() {
119 return context_.get(); 119 return context_.get();
120 } 120 }
121 121
122 const gpu::gles2::FeatureInfo::Workarounds& workarounds() const; 122 const gpu::gles2::FeatureInfo::Workarounds& workarounds() const;
123 123
124 // GpuControl implementation. 124 // GpuControl implementation.
125 void SetGpuControlClient(GpuControlClient*) override;
126 Capabilities GetCapabilities() override; 125 Capabilities GetCapabilities() override;
127 int32_t CreateImage(ClientBuffer buffer, 126 int32_t CreateImage(ClientBuffer buffer,
128 size_t width, 127 size_t width,
129 size_t height, 128 size_t height,
130 unsigned internalformat) override; 129 unsigned internalformat) override;
131 void DestroyImage(int32_t id) override; 130 void DestroyImage(int32_t id) override;
132 int32_t CreateGpuMemoryBufferImage(size_t width, 131 int32_t CreateGpuMemoryBufferImage(size_t width,
133 size_t height, 132 size_t height,
134 unsigned internalformat, 133 unsigned internalformat,
135 unsigned usage) override; 134 unsigned usage) override;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 // Used on Android to virtualize GL for all contexts. 184 // Used on Android to virtualize GL for all contexts.
186 static int use_count_; 185 static int use_count_;
187 static scoped_refptr<gfx::GLShareGroup>* base_share_group_; 186 static scoped_refptr<gfx::GLShareGroup>* base_share_group_;
188 static scoped_refptr<gfx::GLSurface>* base_surface_; 187 static scoped_refptr<gfx::GLSurface>* base_surface_;
189 static scoped_refptr<gfx::GLContext>* base_context_; 188 static scoped_refptr<gfx::GLContext>* base_context_;
190 }; 189 };
191 190
192 } // namespace gpu 191 } // namespace gpu
193 192
194 #endif // GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_ 193 #endif // GPU_COMMAND_BUFFER_TESTS_GL_MANAGER_H_
OLDNEW
« no previous file with comments | « gpu/command_buffer/service/in_process_command_buffer.cc ('k') | gpu/command_buffer/tests/gl_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698