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/gles2_conform_support/egl/display.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
« no previous file with comments | « gpu/command_buffer/tests/gl_manager.cc ('k') | gpu/gles2_conform_support/egl/display.cc » ('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 (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_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_ 5 #ifndef GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
6 #define GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_ 6 #define GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
7 7
8 #include <EGL/egl.h> 8 #include <EGL/egl.h>
9 #include <stddef.h> 9 #include <stddef.h>
10 #include <stdint.h> 10 #include <stdint.h>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 71
72 // Context routines. 72 // Context routines.
73 bool IsValidContext(EGLContext ctx); 73 bool IsValidContext(EGLContext ctx);
74 EGLContext CreateContext(EGLConfig config, 74 EGLContext CreateContext(EGLConfig config,
75 EGLContext share_ctx, 75 EGLContext share_ctx,
76 const EGLint* attrib_list); 76 const EGLint* attrib_list);
77 void DestroyContext(EGLContext ctx); 77 void DestroyContext(EGLContext ctx);
78 bool MakeCurrent(EGLSurface draw, EGLSurface read, EGLContext ctx); 78 bool MakeCurrent(EGLSurface draw, EGLSurface read, EGLContext ctx);
79 79
80 // GpuControl implementation. 80 // GpuControl implementation.
81 void SetGpuControlClient(gpu::GpuControlClient*) override;
82 gpu::Capabilities GetCapabilities() override; 81 gpu::Capabilities GetCapabilities() override;
83 int32_t CreateImage(ClientBuffer buffer, 82 int32_t CreateImage(ClientBuffer buffer,
84 size_t width, 83 size_t width,
85 size_t height, 84 size_t height,
86 unsigned internalformat) override; 85 unsigned internalformat) override;
87 void DestroyImage(int32_t id) override; 86 void DestroyImage(int32_t id) override;
88 int32_t CreateGpuMemoryBufferImage(size_t width, 87 int32_t CreateGpuMemoryBufferImage(size_t width,
89 size_t height, 88 size_t height,
90 unsigned internalformat, 89 unsigned internalformat,
91 unsigned usage) override; 90 unsigned usage) override;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 scoped_ptr<Config> config_; 127 scoped_ptr<Config> config_;
129 scoped_ptr<Surface> surface_; 128 scoped_ptr<Surface> surface_;
130 scoped_ptr<gpu::gles2::GLES2Implementation> context_; 129 scoped_ptr<gpu::gles2::GLES2Implementation> context_;
131 130
132 DISALLOW_COPY_AND_ASSIGN(Display); 131 DISALLOW_COPY_AND_ASSIGN(Display);
133 }; 132 };
134 133
135 } // namespace egl 134 } // namespace egl
136 135
137 #endif // GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_ 136 #endif // GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_
OLDNEW
« no previous file with comments | « gpu/command_buffer/tests/gl_manager.cc ('k') | gpu/gles2_conform_support/egl/display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698