| Index: ui/ozone/platform/x11/gl_ozone_glx.h
|
| diff --git a/ui/ozone/common/gl_ozone_egl.h b/ui/ozone/platform/x11/gl_ozone_glx.h
|
| similarity index 59%
|
| copy from ui/ozone/common/gl_ozone_egl.h
|
| copy to ui/ozone/platform/x11/gl_ozone_glx.h
|
| index 300ebe717803e6f53d1ff5bf791136523a73bd0d..b446ee2b67453566126ab18acaf2f3e8c14e0e3c 100644
|
| --- a/ui/ozone/common/gl_ozone_egl.h
|
| +++ b/ui/ozone/platform/x11/gl_ozone_glx.h
|
| @@ -2,23 +2,20 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_OZONE_COMMON_GL_OZONE_EGL_H_
|
| -#define UI_OZONE_COMMON_GL_OZONE_EGL_H_
|
| +#ifndef UI_OZONE_PLATFORM_X11_GL_OZONE_GLX_H_
|
| +#define UI_OZONE_PLATFORM_X11_GL_OZONE_GLX_H_
|
|
|
| -#include "base/callback.h"
|
| #include "base/macros.h"
|
| #include "ui/gl/gl_implementation.h"
|
| #include "ui/ozone/public/gl_ozone.h"
|
|
|
| namespace ui {
|
|
|
| -// A partial implementation of GLOzone for EGL.
|
| -class GLOzoneEGL : public GLOzone {
|
| +class GLOzoneGLX : public GLOzone {
|
| public:
|
| - GLOzoneEGL() {}
|
| - ~GLOzoneEGL() override {}
|
| + GLOzoneGLX() {}
|
| + ~GLOzoneGLX() override {}
|
|
|
| - // GLOzone:
|
| bool InitializeGLOneOffPlatform() override;
|
| bool InitializeStaticGLBindings(gl::GLImplementation implementation) override;
|
| void InitializeDebugGLBindings() override;
|
| @@ -30,24 +27,16 @@ class GLOzoneEGL : public GLOzone {
|
| gl::GLSurface* compatible_surface,
|
| gl::GpuPreference gpu_preference) override;
|
| scoped_refptr<gl::GLSurface> CreateViewGLSurface(
|
| - gfx::AcceleratedWidget window) override = 0;
|
| + gfx::AcceleratedWidget window) override;
|
| scoped_refptr<gl::GLSurface> CreateSurfacelessViewGLSurface(
|
| gfx::AcceleratedWidget window) override;
|
| scoped_refptr<gl::GLSurface> CreateOffscreenGLSurface(
|
| - const gfx::Size& size) override = 0;
|
| -
|
| - protected:
|
| - // Returns native platform display handle. This is used to obtain the EGL
|
| - // display connection for the native display.
|
| - virtual intptr_t GetNativeDisplay() = 0;
|
| -
|
| - // Sets up GL bindings for the native surface.
|
| - virtual bool LoadGLES2Bindings() = 0;
|
| + const gfx::Size& size) override;
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(GLOzoneEGL);
|
| + DISALLOW_COPY_AND_ASSIGN(GLOzoneGLX);
|
| };
|
|
|
| } // namespace ui
|
|
|
| -#endif // UI_OZONE_COMMON_GL_OZONE_EGL_H_
|
| +#endif // UI_OZONE_PLATFORM_X11_GL_OZONE_GLX_H_
|
|
|