AvaloniaUI
/
angle
зеркало из https://github.com/AvaloniaUI/angle.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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/+/2211763
Reviewed-by: Michael Spang <spang@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Commit-Queue: Geoff Lang <geofflang@chromium.org>
This commit is contained in:
Maksim Sisov 2020-05-21 13:17:21 +03:00 коммит произвёл Commit Bot
Родитель 9bb7dd8a9a
Коммит 56a4cc125f
10 изменённых файлов: 208 добавлений и 210 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
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
}
}

2
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',

12
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

146
src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp → src/libANGLE/renderer/gl/egl/gbm/DisplayGbm.cpp
Просмотреть файл

@ -4,9 +4,9 @@
// found in the LICENSE file.
//
// DisplayOzone.cpp: Ozone implementation of egl::Display
// DisplayGbm.cpp: Gbm implementation of egl::Display
#include "libANGLE/renderer/gl/egl/ozone/DisplayOzone.h"
#include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h"
#include <fcntl.h>
#include <poll.h>
@ -29,7 +29,7 @@
#include "libANGLE/renderer/gl/egl/ContextEGL.h"
#include "libANGLE/renderer/gl/egl/DisplayEGL.h"
#include "libANGLE/renderer/gl/egl/FunctionsEGLDL.h"
#include "libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h"
#include "libANGLE/renderer/gl/egl/gbm/SurfaceGbm.h"
#include "platform/Platform.h"
// ARM-specific extension needed to make Mali GPU behave - not in any
@ -91,13 +91,13 @@ SwapControlData::SwapControlData()
: targetSwapInterval(0), maxSwapInterval(-1), currentSwapInterval(-1)
{}
DisplayOzone::Buffer::Buffer(DisplayOzone *display,
uint32_t useFlags,
uint32_t gbmFormat,
uint32_t drmFormat,
uint32_t drmFormatFB,
int depthBits,
int stencilBits)
DisplayGbm::Buffer::Buffer(DisplayGbm *display,
uint32_t useFlags,
uint32_t gbmFormat,
uint32_t drmFormat,
uint32_t drmFormatFB,
int depthBits,
int stencilBits)
: mDisplay(display),
mNative(nullptr),
mWidth(0),
@ -118,7 +118,7 @@ DisplayOzone::Buffer::Buffer(DisplayOzone *display,
mTexture(0)
{}
DisplayOzone::Buffer::~Buffer()
DisplayGbm::Buffer::~Buffer()
{
reset();
@ -129,7 +129,7 @@ DisplayOzone::Buffer::~Buffer()
mDSBuffer = 0;
}
void DisplayOzone::Buffer::reset()
void DisplayGbm::Buffer::reset()
{
if (mHasDRMFB)
{
@ -167,7 +167,7 @@ void DisplayOzone::Buffer::reset()
}
}
bool DisplayOzone::Buffer::resize(int32_t width, int32_t height)
bool DisplayGbm::Buffer::resize(int32_t width, int32_t height)
{
if (mWidth == width && mHeight == height)
{
@ -231,24 +231,24 @@ bool DisplayOzone::Buffer::resize(int32_t width, int32_t height)
return true;
}
bool DisplayOzone::Buffer::initialize(const NativeWindow *native)
bool DisplayGbm::Buffer::initialize(const NativeWindow *native)
{
mNative = native;
return createRenderbuffers() && resize(native->width, native->height);
}
bool DisplayOzone::Buffer::initialize(int width, int height)
bool DisplayGbm::Buffer::initialize(int width, int height)
{
return createRenderbuffers() && resize(width, height);
}
void DisplayOzone::Buffer::bindTexImage()
void DisplayGbm::Buffer::bindTexImage()
{
const FunctionsGL *gl = mDisplay->mRenderer->getFunctions();
gl->eGLImageTargetTexture2DOES(GL_TEXTURE_2D, mImage);
}
GLuint DisplayOzone::Buffer::getTexture()
GLuint DisplayGbm::Buffer::getTexture()
{
// TODO(fjhenigman) Try not to create a new texture every time. That already works on Intel
// and should work on Mali with proper fences.
@ -266,7 +266,7 @@ GLuint DisplayOzone::Buffer::getTexture()
return mTexture;
}
uint32_t DisplayOzone::Buffer::getDRMFB()
uint32_t DisplayGbm::Buffer::getDRMFB()
{
if (!mHasDRMFB)
{
@ -287,7 +287,7 @@ uint32_t DisplayOzone::Buffer::getDRMFB()
return mDRMFB;
}
GLuint DisplayOzone::Buffer::createGLFB(const gl::Context *context)
GLuint DisplayGbm::Buffer::createGLFB(const gl::Context *context)
{
const FunctionsGL *functions = GetFunctionsGL(context);
StateManagerGL *stateManager = GetStateManagerGL(context);
@ -314,13 +314,13 @@ GLuint DisplayOzone::Buffer::createGLFB(const gl::Context *context)
return framebuffer;
}
FramebufferGL *DisplayOzone::Buffer::framebufferGL(const gl::Context *context,
const gl::FramebufferState &state)
FramebufferGL *DisplayGbm::Buffer::framebufferGL(const gl::Context *context,
const gl::FramebufferState &state)
{
return new FramebufferGL(state, createGLFB(context), true, false);
}
void DisplayOzone::Buffer::present(const gl::Context *context)
void DisplayGbm::Buffer::present(const gl::Context *context)
{
if (mNative)
{
@ -332,7 +332,7 @@ void DisplayOzone::Buffer::present(const gl::Context *context)
}
}
bool DisplayOzone::Buffer::createRenderbuffers()
bool DisplayGbm::Buffer::createRenderbuffers()
{
const FunctionsGL *gl = mDisplay->mRenderer->getFunctions();
StateManagerGL *sm = mDisplay->mRenderer->getStateManager();
@ -349,7 +349,7 @@ bool DisplayOzone::Buffer::createRenderbuffers()
return true;
}
DisplayOzone::DisplayOzone(const egl::DisplayState &state)
DisplayGbm::DisplayGbm(const egl::DisplayState &state)
: DisplayEGL(state),
mGBM(nullptr),
mConnector(nullptr),
@ -373,9 +373,9 @@ DisplayOzone::DisplayOzone(const egl::DisplayState &state)
mDepthUniform(0)
{}
DisplayOzone::~DisplayOzone() {}
DisplayGbm::~DisplayGbm() {}
bool DisplayOzone::hasUsableScreen(int fd)
bool DisplayGbm::hasUsableScreen(int fd)
{
drmModeResPtr resources = drmModeGetResources(fd);
if (!resources)
@ -429,7 +429,7 @@ bool DisplayOzone::hasUsableScreen(int fd)
return false;
}
egl::Error DisplayOzone::initialize(egl::Display *display)
egl::Error DisplayGbm::initialize(egl::Display *display)
{
int fd;
char deviceName[30];
@ -545,18 +545,18 @@ egl::Error DisplayOzone::initialize(egl::Display *display)
return DisplayGL::initialize(display);
}
void DisplayOzone::pageFlipHandler(int fd,
unsigned int sequence,
unsigned int tv_sec,
unsigned int tv_usec,
void *data)
void DisplayGbm::pageFlipHandler(int fd,
unsigned int sequence,
unsigned int tv_sec,
unsigned int tv_usec,
void *data)
{
DisplayOzone *display = reinterpret_cast<DisplayOzone *>(data);
uint64_t tv = tv_sec;
DisplayGbm *display = reinterpret_cast<DisplayGbm *>(data);
uint64_t tv = tv_sec;
display->pageFlipHandler(sequence, tv * 1000000 + tv_usec);
}
void DisplayOzone::pageFlipHandler(unsigned int sequence, uint64_t tv)
void DisplayGbm::pageFlipHandler(unsigned int sequence, uint64_t tv)
{
ASSERT(mPending);
mUnused = mScanning;
@ -564,7 +564,7 @@ void DisplayOzone::pageFlipHandler(unsigned int sequence, uint64_t tv)
mPending = nullptr;
}
void DisplayOzone::presentScreen()
void DisplayGbm::presentScreen()
{
if (!mCRTC)
{
@ -615,7 +615,7 @@ void DisplayOzone::presentScreen()
}
}
GLuint DisplayOzone::makeShader(GLuint type, const char *src)
GLuint DisplayGbm::makeShader(GLuint type, const char *src)
{
const FunctionsGL *gl = mRenderer->getFunctions();
GLuint shader = gl->createShader(type);
@ -629,13 +629,13 @@ GLuint DisplayOzone::makeShader(GLuint type, const char *src)
gl->getShaderiv(shader, GL_COMPILE_STATUS, &compiled);
if (compiled != GL_TRUE)
{
WARN() << "DisplayOzone shader compilation error: " << buf;
WARN() << "DisplayGbm shader compilation error: " << buf;
}
return shader;
}
void DisplayOzone::drawWithTexture(const gl::Context *context, Buffer *buffer)
void DisplayGbm::drawWithTexture(const gl::Context *context, Buffer *buffer)
{
const FunctionsGL *gl = mRenderer->getFunctions();
StateManagerGL *sm = mRenderer->getStateManager();
@ -767,7 +767,7 @@ void DisplayOzone::drawWithTexture(const gl::Context *context, Buffer *buffer)
sm->deleteFramebuffer(fbo);
}
void DisplayOzone::drawBuffer(const gl::Context *context, Buffer *buffer)
void DisplayGbm::drawBuffer(const gl::Context *context, Buffer *buffer)
{
if (!mDrawing)
{
@ -806,7 +806,7 @@ void DisplayOzone::drawBuffer(const gl::Context *context, Buffer *buffer)
presentScreen();
}
void DisplayOzone::flushGL()
void DisplayGbm::flushGL()
{
const FunctionsGL *gl = mRenderer->getFunctions();
gl->flush();
@ -836,7 +836,7 @@ void DisplayOzone::flushGL()
}
}
void DisplayOzone::terminate()
void DisplayGbm::terminate()
{
SafeDelete(mScanning);
SafeDelete(mPending);
@ -883,9 +883,9 @@ void DisplayOzone::terminate()
}
}
SurfaceImpl *DisplayOzone::createWindowSurface(const egl::SurfaceState &state,
EGLNativeWindowType window,
const egl::AttributeMap &attribs)
SurfaceImpl *DisplayGbm::createWindowSurface(const egl::SurfaceState &state,
EGLNativeWindowType window,
const egl::AttributeMap &attribs)
{
Buffer *buffer = new Buffer(this, GBM_BO_USE_RENDERING, GBM_FORMAT_ARGB8888,
DRM_FORMAT_ARGB8888, DRM_FORMAT_XRGB8888, true, true);
@ -893,11 +893,11 @@ SurfaceImpl *DisplayOzone::createWindowSurface(const egl::SurfaceState &state,
{
return nullptr;
}
return new SurfaceOzone(state, buffer);
return new SurfaceGbm(state, buffer);
}
SurfaceImpl *DisplayOzone::createPbufferSurface(const egl::SurfaceState &state,
const egl::AttributeMap &attribs)
SurfaceImpl *DisplayGbm::createPbufferSurface(const egl::SurfaceState &state,
const egl::AttributeMap &attribs)
{
EGLAttrib width = attribs.get(EGL_WIDTH, 0);
EGLAttrib height = attribs.get(EGL_HEIGHT, 0);
@ -907,27 +907,27 @@ SurfaceImpl *DisplayOzone::createPbufferSurface(const egl::SurfaceState &state,
{
return nullptr;
}
return new SurfaceOzone(state, buffer);
return new SurfaceGbm(state, buffer);
}
ContextImpl *DisplayOzone::createContext(const gl::State &state,
gl::ErrorSet *errorSet,
const egl::Config *configuration,
const gl::Context *shareContext,
const egl::AttributeMap &attribs)
ContextImpl *DisplayGbm::createContext(const gl::State &state,
gl::ErrorSet *errorSet,
const egl::Config *configuration,
const gl::Context *shareContext,
const egl::AttributeMap &attribs)
{
// All contexts on Ozone are virtualized and share the same renderer.
// All contexts on Gbm are virtualized and share the same renderer.
return new ContextEGL(state, errorSet, mRenderer);
}
egl::Error DisplayOzone::makeCurrent(egl::Surface *drawSurface,
egl::Surface *readSurface,
gl::Context *context)
egl::Error DisplayGbm::makeCurrent(egl::Surface *drawSurface,
egl::Surface *readSurface,
gl::Context *context)
{
return DisplayGL::makeCurrent(drawSurface, readSurface, context);
}
egl::ConfigSet DisplayOzone::generateConfigs()
egl::ConfigSet DisplayGbm::generateConfigs()
{
egl::ConfigSet configs;
@ -949,17 +949,17 @@ egl::ConfigSet DisplayOzone::generateConfigs()
return configs;
}
bool DisplayOzone::isValidNativeWindow(EGLNativeWindowType window) const
bool DisplayGbm::isValidNativeWindow(EGLNativeWindowType window) const
{
return true;
}
void DisplayOzone::setSwapInterval(EGLSurface drawable, SwapControlData *data)
void DisplayGbm::setSwapInterval(EGLSurface drawable, SwapControlData *data)
{
ASSERT(data != nullptr);
}
void DisplayOzone::generateExtensions(egl::DisplayExtensions *outExtensions) const
void DisplayGbm::generateExtensions(egl::DisplayExtensions *outExtensions) const
{
DisplayEGL::generateExtensions(outExtensions);
@ -967,11 +967,11 @@ void DisplayOzone::generateExtensions(egl::DisplayExtensions *outExtensions) con
outExtensions->surfacelessContext = true;
}
class WorkerContextOzone final : public WorkerContext
class WorkerContextGbm final : public WorkerContext
{
public:
WorkerContextOzone(EGLContext context, FunctionsEGL *functions);
~WorkerContextOzone() override;
WorkerContextGbm(EGLContext context, FunctionsEGL *functions);
~WorkerContextGbm() override;
bool makeCurrent() override;
void unmakeCurrent() override;
@ -981,16 +981,16 @@ class WorkerContextOzone final : public WorkerContext
FunctionsEGL *mFunctions;
};
WorkerContextOzone::WorkerContextOzone(EGLContext context, FunctionsEGL *functions)
WorkerContextGbm::WorkerContextGbm(EGLContext context, FunctionsEGL *functions)
: mContext(context), mFunctions(functions)
{}
WorkerContextOzone::~WorkerContextOzone()
WorkerContextGbm::~WorkerContextGbm()
{
mFunctions->destroyContext(mContext);
}
bool WorkerContextOzone::makeCurrent()
bool WorkerContextGbm::makeCurrent()
{
if (mFunctions->makeCurrent(EGL_NO_SURFACE, mContext) == EGL_FALSE)
{
@ -1000,14 +1000,14 @@ bool WorkerContextOzone::makeCurrent()
return true;
}
void WorkerContextOzone::unmakeCurrent()
void WorkerContextGbm::unmakeCurrent()
{
mFunctions->makeCurrent(EGL_NO_SURFACE, EGL_NO_CONTEXT);
}
WorkerContext *DisplayOzone::createWorkerContext(std::string *infoLog,
EGLContext sharedContext,
const native_egl::AttributeVector workerAttribs)
WorkerContext *DisplayGbm::createWorkerContext(std::string *infoLog,
EGLContext sharedContext,
const native_egl::AttributeVector workerAttribs)
{
EGLContext context = mEGL->createContext(mConfig, sharedContext, workerAttribs.data());
if (context == EGL_NO_CONTEXT)
@ -1015,7 +1015,7 @@ WorkerContext *DisplayOzone::createWorkerContext(std::string *infoLog,
*infoLog += "Unable to create the EGL context.";
return nullptr;
}
return new WorkerContextOzone(context, mEGL);
return new WorkerContextGbm(context, mEGL);
}
} // namespace rx

22
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_

100
src/libANGLE/renderer/gl/egl/gbm/SurfaceGbm.cpp Normal file
Просмотреть файл

@ -0,0 +1,100 @@
//
// Copyright 2016 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// SurfaceGbm.cpp: Gbm implementation of egl::SurfaceGL
#include "libANGLE/renderer/gl/egl/gbm/SurfaceGbm.h"
#include "libANGLE/renderer/gl/FramebufferGL.h"
#include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h"
namespace rx
{
SurfaceGbm::SurfaceGbm(const egl::SurfaceState &state, DisplayGbm::Buffer *buffer)
: SurfaceGL(state), mBuffer(buffer)
{}
SurfaceGbm::~SurfaceGbm()
{
delete mBuffer;
}
egl::Error SurfaceGbm::initialize(const egl::Display *display)
{
return egl::NoError();
}
FramebufferImpl *SurfaceGbm::createDefaultFramebuffer(const gl::Context *context,
const gl::FramebufferState &state)
{
return mBuffer->framebufferGL(context, state);
}
egl::Error SurfaceGbm::makeCurrent(const gl::Context *context)
{
return egl::NoError();
}
egl::Error SurfaceGbm::swap(const gl::Context *context)
{
mBuffer->present(context);
return egl::NoError();
}
egl::Error SurfaceGbm::postSubBuffer(const gl::Context *context,
EGLint x,
EGLint y,
EGLint width,
EGLint height)
{
UNIMPLEMENTED();
return egl::NoError();
}
egl::Error SurfaceGbm::querySurfacePointerANGLE(EGLint attribute, void **value)
{
UNIMPLEMENTED();
return egl::NoError();
}
egl::Error SurfaceGbm::bindTexImage(const gl::Context *context, gl::Texture *texture, EGLint buffer)
{
mBuffer->bindTexImage();
return egl::NoError();
}
egl::Error SurfaceGbm::releaseTexImage(const gl::Context *context, EGLint buffer)
{
return egl::NoError();
}
void SurfaceGbm::setSwapInterval(EGLint interval)
{
mSwapControl.targetSwapInterval = interval;
}
EGLint SurfaceGbm::getWidth() const
{
return mBuffer->getWidth();
}
EGLint SurfaceGbm::getHeight() const
{
return mBuffer->getHeight();
}
EGLint SurfaceGbm::isPostSubBufferSupported() const
{
UNIMPLEMENTED();
return EGL_FALSE;
}
EGLint SurfaceGbm::getSwapBehavior() const
{
return EGL_BUFFER_PRESERVED;
}
} // namespace rx

18
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_

102
src/libANGLE/renderer/gl/egl/ozone/SurfaceOzone.cpp
Просмотреть файл

@ -1,102 +0,0 @@
//
// Copyright 2016 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// SurfaceOzone.cpp: Ozone implementation of egl::SurfaceGL
#include "libANGLE/renderer/gl/egl/ozone/SurfaceOzone.h"
#include "libANGLE/renderer/gl/FramebufferGL.h"
#include "libANGLE/renderer/gl/egl/ozone/DisplayOzone.h"
namespace rx
{
SurfaceOzone::SurfaceOzone(const egl::SurfaceState &state, DisplayOzone::Buffer *buffer)
: SurfaceGL(state), mBuffer(buffer)
{}
SurfaceOzone::~SurfaceOzone()
{
delete mBuffer;
}
egl::Error SurfaceOzone::initialize(const egl::Display *display)
{
return egl::NoError();
}
FramebufferImpl *SurfaceOzone::createDefaultFramebuffer(const gl::Context *context,
const gl::FramebufferState &state)
{
return mBuffer->framebufferGL(context, state);
}
egl::Error SurfaceOzone::makeCurrent(const gl::Context *context)
{
return egl::NoError();
}
egl::Error SurfaceOzone::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)
{
UNIMPLEMENTED();
return egl::NoError();
}
egl::Error SurfaceOzone::querySurfacePointerANGLE(EGLint attribute, void **value)
{
UNIMPLEMENTED();
return egl::NoError();
}
egl::Error SurfaceOzone::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)
{
return egl::NoError();
}
void SurfaceOzone::setSwapInterval(EGLint interval)
{
mSwapControl.targetSwapInterval = interval;
}
EGLint SurfaceOzone::getWidth() const
{
return mBuffer->getWidth();
}
EGLint SurfaceOzone::getHeight() const
{
return mBuffer->getHeight();
}
EGLint SurfaceOzone::isPostSubBufferSupported() const
{
UNIMPLEMENTED();
return EGL_FALSE;
}
EGLint SurfaceOzone::getSwapBehavior() const
{
return EGL_BUFFER_PRESERVED;
}
} // namespace rx

10
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 = [

2
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);