| Index: gpu/gles2_conform_support/egl/display.h
|
| diff --git a/gpu/gles2_conform_support/egl/display.h b/gpu/gles2_conform_support/egl/display.h
|
| index a1e82fee6409f0ddf6bcc8a5d27e40364c96947d..651ab1abd8ad9caf5ce1db37dafbed664883d7cd 100644
|
| --- a/gpu/gles2_conform_support/egl/display.h
|
| +++ b/gpu/gles2_conform_support/egl/display.h
|
| @@ -38,7 +38,7 @@ class Surface;
|
| class Display : private gpu::GpuControl {
|
| public:
|
| explicit Display(EGLNativeDisplayType display_id);
|
| - virtual ~Display();
|
| + ~Display() override;
|
|
|
| void SetCreateOffscreen(int width, int height) {
|
| create_offscreen_ = true;
|
| @@ -74,25 +74,24 @@ class Display : private gpu::GpuControl {
|
| bool MakeCurrent(EGLSurface draw, EGLSurface read, EGLContext ctx);
|
|
|
| // GpuControl implementation.
|
| - virtual gpu::Capabilities GetCapabilities() override;
|
| - virtual int32_t CreateImage(ClientBuffer buffer,
|
| - size_t width,
|
| - size_t height,
|
| - unsigned internalformat) override;
|
| - virtual void DestroyImage(int32_t id) override;
|
| - virtual int32_t CreateGpuMemoryBufferImage(size_t width,
|
| - size_t height,
|
| - unsigned internalformat,
|
| - unsigned usage) override;
|
| - virtual uint32 InsertSyncPoint() override;
|
| - virtual uint32 InsertFutureSyncPoint() override;
|
| - virtual void RetireSyncPoint(uint32 sync_point) override;
|
| - virtual void SignalSyncPoint(uint32 sync_point,
|
| - const base::Closure& callback) override;
|
| - virtual void SignalQuery(uint32 query,
|
| - const base::Closure& callback) override;
|
| - virtual void SetSurfaceVisible(bool visible) override;
|
| - virtual uint32 CreateStreamTexture(uint32 texture_id) override;
|
| + gpu::Capabilities GetCapabilities() override;
|
| + int32_t CreateImage(ClientBuffer buffer,
|
| + size_t width,
|
| + size_t height,
|
| + unsigned internalformat) override;
|
| + void DestroyImage(int32_t id) override;
|
| + int32_t CreateGpuMemoryBufferImage(size_t width,
|
| + size_t height,
|
| + unsigned internalformat,
|
| + unsigned usage) override;
|
| + uint32 InsertSyncPoint() override;
|
| + uint32 InsertFutureSyncPoint() override;
|
| + void RetireSyncPoint(uint32 sync_point) override;
|
| + void SignalSyncPoint(uint32 sync_point,
|
| + const base::Closure& callback) override;
|
| + void SignalQuery(uint32 query, const base::Closure& callback) override;
|
| + void SetSurfaceVisible(bool visible) override;
|
| + uint32 CreateStreamTexture(uint32 texture_id) override;
|
|
|
| private:
|
| EGLNativeDisplayType display_id_;
|
|
|