| OLD | NEW |
| 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 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 uint32 InsertSyncPoint() override; | 91 uint32 InsertSyncPoint() override; |
| 92 uint32 InsertFutureSyncPoint() override; | 92 uint32 InsertFutureSyncPoint() override; |
| 93 void RetireSyncPoint(uint32 sync_point) override; | 93 void RetireSyncPoint(uint32 sync_point) override; |
| 94 void SignalSyncPoint(uint32 sync_point, | 94 void SignalSyncPoint(uint32 sync_point, |
| 95 const base::Closure& callback) override; | 95 const base::Closure& callback) override; |
| 96 void SignalQuery(uint32 query, const base::Closure& callback) override; | 96 void SignalQuery(uint32 query, const base::Closure& callback) override; |
| 97 void SetSurfaceVisible(bool visible) override; | 97 void SetSurfaceVisible(bool visible) override; |
| 98 uint32 CreateStreamTexture(uint32 texture_id) override; | 98 uint32 CreateStreamTexture(uint32 texture_id) override; |
| 99 void SetLock(base::Lock*) override; | 99 void SetLock(base::Lock*) override; |
| 100 bool IsGpuChannelLost() override; | 100 bool IsGpuChannelLost() override; |
| 101 gpu::CommandBufferNamespace GetNamespaceID() const override; |
| 102 uint64_t GetCommandBufferID() const override; |
| 101 | 103 |
| 102 private: | 104 private: |
| 103 EGLNativeDisplayType display_id_; | 105 EGLNativeDisplayType display_id_; |
| 104 | 106 |
| 105 bool is_initialized_; | 107 bool is_initialized_; |
| 106 | 108 |
| 107 // elg::Display is used for comformance tests and command_buffer_gles. We only | 109 // elg::Display is used for comformance tests and command_buffer_gles. We only |
| 108 // need the exit manager for the command_buffer_gles library. | 110 // need the exit manager for the command_buffer_gles library. |
| 109 // TODO(hendrikw): Find a cleaner solution for this. | 111 // TODO(hendrikw): Find a cleaner solution for this. |
| 110 #if defined(COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY) | 112 #if defined(COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY) |
| (...skipping 17 matching lines...) Expand all Loading... |
| 128 scoped_ptr<Config> config_; | 130 scoped_ptr<Config> config_; |
| 129 scoped_ptr<Surface> surface_; | 131 scoped_ptr<Surface> surface_; |
| 130 scoped_ptr<gpu::gles2::GLES2Implementation> context_; | 132 scoped_ptr<gpu::gles2::GLES2Implementation> context_; |
| 131 | 133 |
| 132 DISALLOW_COPY_AND_ASSIGN(Display); | 134 DISALLOW_COPY_AND_ASSIGN(Display); |
| 133 }; | 135 }; |
| 134 | 136 |
| 135 } // namespace egl | 137 } // namespace egl |
| 136 | 138 |
| 137 #endif // GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_ | 139 #endif // GPU_GLES2_CONFORM_SUPPORT_EGL_DISPLAY_H_ |
| OLD | NEW |