Skip to content

A
angle
Commit 56a4cc12 by Maksim Sisov Committed by Commit Bot
Options

Rename DisplayOzone to DisplayGbm.

DisplayOzone doesn't really have anything related to Ozone. Instead, it's the gbm platform that is used there. Thus, rename it to DisplayGbm. Bug: chromium:1084458 Change-Id: I4d974f6afbf0daa28fc3e83943b35814dca203fd Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2211763Reviewed-by: 's avatarMichael Spang <spang@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>
parent 9bb7dd8a
Showing with 58 additions and 60 deletions
BUILD.gn
......@@ -686,9 +686,9 @@ angle_source_set("libANGLE_base") {
}
if (ozone_platform_gbm) {
configs += [ ":libdrm" ]
defines += [ "ANGLE_USE_OZONE" ]
defines += [ "ANGLE_USE_GBM" ]
deps += [ "//third_party/minigbm" ]
sources += libangle_gl_ozone_sources
sources += libangle_gl_gbm_sources
}
}
......
scripts/export_targets.py
......@@ -187,7 +187,7 @@ IGNORED_INCLUDES = {
b'libANGLE/renderer/gl/eagl/DisplayEAGL.h',
b'libANGLE/renderer/gl/egl/android/DisplayAndroid.h',
b'libANGLE/renderer/gl/egl/DisplayEGL.h',
b'libANGLE/renderer/gl/egl/ozone/DisplayOzone.h',
b'libANGLE/renderer/gl/egl/gbm/DisplayGbm.h',
b'libANGLE/renderer/gl/glx/DisplayGLX.h',
b'libANGLE/renderer/gl/wgl/DisplayWGL.h',
b'libANGLE/renderer/metal/DisplayMtl_api.h',
......
src/libANGLE/Display.cpp
......@@ -55,8 +55,8 @@
# elif defined(ANGLE_PLATFORM_IOS)
# include "libANGLE/renderer/gl/eagl/DisplayEAGL.h"
# elif defined(ANGLE_PLATFORM_LINUX)
# if defined(ANGLE_USE_OZONE)
# include "libANGLE/renderer/gl/egl/ozone/DisplayOzone.h"
# if defined(ANGLE_USE_GBM)
# include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h"
# else
# include "libANGLE/renderer/gl/egl/DisplayEGL.h"
# if defined(ANGLE_USE_X11)
......@@ -187,7 +187,7 @@ EGLAttrib GetDisplayTypeFromEnvironment()
#elif defined(ANGLE_ENABLE_VULKAN) && defined(ANGLE_PLATFORM_ANDROID)
return EGL_PLATFORM_ANGLE_TYPE_VULKAN_ANGLE;
#elif defined(ANGLE_ENABLE_OPENGL)
# if defined(ANGLE_PLATFORM_ANDROID) || defined(ANGLE_USE_OZONE)
# if defined(ANGLE_PLATFORM_ANDROID) || defined(ANGLE_USE_GBM)
return EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE;
# else
return EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE;
......@@ -285,8 +285,8 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib displayType,
# if defined(ANGLE_PLATFORM_WINDOWS)
impl = new rx::DisplayWGL(state);
# elif defined(ANGLE_PLATFORM_LINUX)
# if defined(ANGLE_USE_OZONE)
impl = new rx::DisplayOzone(state);
# if defined(ANGLE_USE_GBM)
impl = new rx::DisplayGbm(state);
# else
if (deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_EGL_ANGLE)
{
......@@ -1420,7 +1420,7 @@ static ClientExtensions GenerateClientExtensions()
extensions.x11Visual = true;
#endif
#if defined(ANGLE_PLATFORM_LINUX) && !defined(ANGLE_USE_OZONE)
#if defined(ANGLE_PLATFORM_LINUX) && !defined(ANGLE_USE_GBM)
extensions.platformANGLEDeviceTypeEGLANGLE = true;
#endif
......
src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.h → src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.h
......@@ -4,10 +4,10 @@
// found in the LICENSE file.
//
// DisplayOzone.h: Ozone implementation of egl::Display
// DisplayGbm.h: Gbm implementation of egl::Display
#ifndef LIBANGLE_RENDERER_GL_EGL_OZONE_DISPLAYOZONE_H_
#define LIBANGLE_RENDERER_GL_EGL_OZONE_DISPLAYOZONE_H_
#ifndef LIBANGLE_RENDERER_GL_EGL_GBM_DISPLAYGBM_H_
#define LIBANGLE_RENDERER_GL_EGL_GBM_DISPLAYGBM_H_
#include <xf86drm.h>
#include <xf86drmMode.h>
......@@ -31,7 +31,7 @@ class FramebufferGL;
class RendererEGL;
// TODO(fjhenigman) Implement swap control. The following struct will be used for that.
// State-tracking data for the swap control to allow DisplayOzone to remember per
// State-tracking data for the swap control to allow DisplayGbm to remember per
// drawable information for swap control.
struct SwapControlData final
{
......@@ -40,12 +40,12 @@ struct SwapControlData final
// Set by the drawable
int targetSwapInterval;
// DisplayOzone-side state-tracking
// DisplayGbm-side state-tracking
int maxSwapInterval;
int currentSwapInterval;
};
class DisplayOzone final : public DisplayEGL
class DisplayGbm final : public DisplayEGL
{
public:
struct NativeWindow
......@@ -63,7 +63,7 @@ class DisplayOzone final : public DisplayEGL
class Buffer final : angle::NonCopyable
{
public:
Buffer(DisplayOzone *display,
Buffer(DisplayGbm *display,
uint32_t useFlags,
uint32_t gbmFormat,
uint32_t drmFormat,
......@@ -89,7 +89,7 @@ class DisplayOzone final : public DisplayEGL
private:
bool createRenderbuffers();
DisplayOzone *mDisplay;
DisplayGbm *mDisplay;
const NativeWindow *mNative;
int mWidth;
int mHeight;
......@@ -109,8 +109,8 @@ class DisplayOzone final : public DisplayEGL
GLuint mTexture;
};
DisplayOzone(const egl::DisplayState &state);
~DisplayOzone() override;
DisplayGbm(const egl::DisplayState &state);
~DisplayGbm() override;
egl::Error initialize(egl::Display *display) override;
void terminate() override;
......@@ -190,4 +190,4 @@ class DisplayOzone final : public DisplayEGL
};
} // namespace rx
#endif // LIBANGLE_RENDERER_GL_EGL_OZONE_DISPLAYOZONE_H_
#endif // LIBANGLE_RENDERER_GL_EGL_GBM_DISPLAYGBM_H_
src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp → src/libANGLE/renderer/gl/egl/gbm/SurfaceGbm.cpp
......@@ -4,98 +4,96 @@
// found in the LICENSE file.
//
// SurfaceOzone.cpp: Ozone implementation of egl::SurfaceGL
// SurfaceGbm.cpp: Gbm implementation of egl::SurfaceGL
#include "libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h"
#include "libANGLE/renderer/gl/egl/gbm/SurfaceGbm.h"
#include "libANGLE/renderer/gl/FramebufferGL.h"
#include "libANGLE/renderer/gl/egl/ozone/DisplayOzone.h"
#include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h"
namespace rx
{
SurfaceOzone::SurfaceOzone(const egl::SurfaceState &state, DisplayOzone::Buffer *buffer)
SurfaceGbm::SurfaceGbm(const egl::SurfaceState &state, DisplayGbm::Buffer *buffer)
: SurfaceGL(state), mBuffer(buffer)
{}
SurfaceOzone::~SurfaceOzone()
SurfaceGbm::~SurfaceGbm()
{
delete mBuffer;
}
egl::Error SurfaceOzone::initialize(const egl::Display *display)
egl::Error SurfaceGbm::initialize(const egl::Display *display)
{
return egl::NoError();
}
FramebufferImpl *SurfaceOzone::createDefaultFramebuffer(const gl::Context *context,
const gl::FramebufferState &state)
FramebufferImpl *SurfaceGbm::createDefaultFramebuffer(const gl::Context *context,
const gl::FramebufferState &state)
{
return mBuffer->framebufferGL(context, state);
}
egl::Error SurfaceOzone::makeCurrent(const gl::Context *context)
egl::Error SurfaceGbm::makeCurrent(const gl::Context *context)
{
return egl::NoError();
}
egl::Error SurfaceOzone::swap(const gl::Context *context)
egl::Error SurfaceGbm::swap(const gl::Context *context)
{
mBuffer->present(context);
return egl::NoError();
}
egl::Error SurfaceOzone::postSubBuffer(const gl::Context *context,
EGLint x,
EGLint y,
EGLint width,
EGLint height)
egl::Error SurfaceGbm::postSubBuffer(const gl::Context *context,
EGLint x,
EGLint y,
EGLint width,
EGLint height)
{
UNIMPLEMENTED();
return egl::NoError();
}
egl::Error SurfaceOzone::querySurfacePointerANGLE(EGLint attribute, void **value)
egl::Error SurfaceGbm::querySurfacePointerANGLE(EGLint attribute, void **value)
{
UNIMPLEMENTED();
return egl::NoError();
}
egl::Error SurfaceOzone::bindTexImage(const gl::Context *context,
gl::Texture *texture,
EGLint buffer)
egl::Error SurfaceGbm::bindTexImage(const gl::Context *context, gl::Texture *texture, EGLint buffer)
{
mBuffer->bindTexImage();
return egl::NoError();
}
egl::Error SurfaceOzone::releaseTexImage(const gl::Context *context, EGLint buffer)
egl::Error SurfaceGbm::releaseTexImage(const gl::Context *context, EGLint buffer)
{
return egl::NoError();
}
void SurfaceOzone::setSwapInterval(EGLint interval)
void SurfaceGbm::setSwapInterval(EGLint interval)
{
mSwapControl.targetSwapInterval = interval;
}
EGLint SurfaceOzone::getWidth() const
EGLint SurfaceGbm::getWidth() const
{
return mBuffer->getWidth();
}
EGLint SurfaceOzone::getHeight() const
EGLint SurfaceGbm::getHeight() const
{
return mBuffer->getHeight();
}
EGLint SurfaceOzone::isPostSubBufferSupported() const
EGLint SurfaceGbm::isPostSubBufferSupported() const
{
UNIMPLEMENTED();
return EGL_FALSE;
}
EGLint SurfaceOzone::getSwapBehavior() const
EGLint SurfaceGbm::getSwapBehavior() const
{
return EGL_BUFFER_PRESERVED;
}
......
src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h → src/libANGLE/renderer/gl/egl/gbm/SurfaceGbm.h
......@@ -4,22 +4,22 @@
// found in the LICENSE file.
//
// SurfaceOzone.h: Ozone implementation of egl::SurfaceGL
// SurfaceGbm.h: Gbm implementation of egl::SurfaceGL
#ifndef LIBANGLE_RENDERER_GL_EGL_OZONE_SURFACEOZONE_H_
#define LIBANGLE_RENDERER_GL_EGL_OZONE_SURFACEOZONE_H_
#ifndef LIBANGLE_RENDERER_GL_EGL_GBM_SURFACEGBM_H_
#define LIBANGLE_RENDERER_GL_EGL_GBM_SURFACEGBM_H_
#include "libANGLE/renderer/gl/SurfaceGL.h"
#include "libANGLE/renderer/gl/egl/ozone/DisplayOzone.h"
#include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h"
namespace rx
{
class SurfaceOzone : public SurfaceGL
class SurfaceGbm : public SurfaceGL
{
public:
SurfaceOzone(const egl::SurfaceState &state, DisplayOzone::Buffer *buffer);
~SurfaceOzone() override;
SurfaceGbm(const egl::SurfaceState &state, DisplayGbm::Buffer *buffer);
~SurfaceGbm() override;
FramebufferImpl *createDefaultFramebuffer(const gl::Context *context,
const gl::FramebufferState &state) override;
......@@ -47,11 +47,11 @@ class SurfaceOzone : public SurfaceGL
EGLint getSwapBehavior() const override;
private:
DisplayOzone::Buffer *mBuffer;
DisplayGbm::Buffer *mBuffer;
// TODO(fjhenigman) Implement swap control. This will be used for that.
SwapControlData mSwapControl;
};
} // namespace rx
#endif // LIBANGLE_RENDERER_GL_EGL_OZONE_SURFACEOZONE_H_
#endif // LIBANGLE_RENDERER_GL_EGL_GBM_SURFACEGBM_H_
src/libGLESv2.gni
......@@ -846,11 +846,11 @@ libangle_gl_egl_dl_sources = [
"src/libANGLE/renderer/gl/egl/FunctionsEGLDL.h",
]
libangle_gl_ozone_sources = [
"src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp",
"src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.h",
"src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp",
"src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h",
libangle_gl_gbm_sources = [
"src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.cpp",
"src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.h",
"src/libANGLE/renderer/gl/egl/gbm/SurfaceGbm.cpp",
"src/libANGLE/renderer/gl/egl/gbm/SurfaceGbm.h",
]
libangle_gl_egl_android_sources = [
......
src/tests/deqp_support/tcuANGLEPlatform.cpp
......@@ -68,7 +68,7 @@ ANGLEPlatform::ANGLEPlatform(angle::LogErrorFunc logErrorFunc)
}
#endif // (DE_OS == DE_OS_WIN32)
#if defined(ANGLE_USE_OZONE) || (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_WIN32)
#if defined(ANGLE_USE_GBM) || (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_WIN32)
{
std::vector<eglw::EGLAttrib> glesAttribs =
initAttribs(EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment