Skip to content

A
angle
Commit a26c6b7c by Jamie Madill Committed by Commit Bot
Options

Surface: Make the egl::Config part of SurfaceState.

This will be accessible to the Impl, so they won't have to store a copy of the pointer. BUG=angleproject:1319 Change-Id: I298a11a243d3d32f4c885273e55162e6862f3e16 Reviewed-on: https://chromium-review.googlesource.com/419697 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 3c90ed6b
Showing with 32 additions and 115 deletions
src/libANGLE/Surface.cpp
...@@ -24,17 +24,18 @@ ...@@ -24,17 +24,18 @@
namespace egl namespace egl
{ {
SurfaceState::SurfaceState() : defaultFramebuffer(nullptr) SurfaceState::SurfaceState(const egl::Config *configIn)
: defaultFramebuffer(nullptr), config(configIn)
{ {
} }
Surface::Surface(EGLint surfaceType, const egl::Config *config, const AttributeMap &attributes) Surface::Surface(EGLint surfaceType, const egl::Config *config, const AttributeMap &attributes)
: FramebufferAttachmentObject(), : FramebufferAttachmentObject(),
mState(config),
mImplementation(nullptr), mImplementation(nullptr),
mCurrentCount(0), mCurrentCount(0),
mDestroyed(false), mDestroyed(false),
mType(surfaceType), mType(surfaceType),
mConfig(config),
mPostSubBufferRequested(false), mPostSubBufferRequested(false),
mFixedSize(false), mFixedSize(false),
mFixedWidth(0), mFixedWidth(0),
...@@ -166,7 +167,7 @@ void Surface::setSwapInterval(EGLint interval) ...@@ -166,7 +167,7 @@ void Surface::setSwapInterval(EGLint interval)
const Config *Surface::getConfig() const const Config *Surface::getConfig() const
{ {
return mConfig; return mState.config;
} }
EGLint Surface::getPixelAspectRatio() const EGLint Surface::getPixelAspectRatio() const
...@@ -270,13 +271,13 @@ gl::Framebuffer *Surface::createDefaultFramebuffer() ...@@ -270,13 +271,13 @@ gl::Framebuffer *Surface::createDefaultFramebuffer()
framebuffer->setAttachment(GL_FRAMEBUFFER_DEFAULT, GL_BACK, gl::ImageIndex::MakeInvalid(), framebuffer->setAttachment(GL_FRAMEBUFFER_DEFAULT, GL_BACK, gl::ImageIndex::MakeInvalid(),
this); this);
if (mConfig->depthSize > 0) if (mState.config->depthSize > 0)
{ {
framebuffer->setAttachment(GL_FRAMEBUFFER_DEFAULT, GL_DEPTH, gl::ImageIndex::MakeInvalid(), framebuffer->setAttachment(GL_FRAMEBUFFER_DEFAULT, GL_DEPTH, gl::ImageIndex::MakeInvalid(),
this); this);
} }
if (mConfig->stencilSize > 0) if (mState.config->stencilSize > 0)
{ {
framebuffer->setAttachment(GL_FRAMEBUFFER_DEFAULT, GL_STENCIL, framebuffer->setAttachment(GL_FRAMEBUFFER_DEFAULT, GL_STENCIL,
gl::ImageIndex::MakeInvalid(), this); gl::ImageIndex::MakeInvalid(), this);
...@@ -291,7 +292,7 @@ WindowSurface::WindowSurface(rx::EGLImplFactory *implFactory, ...@@ -291,7 +292,7 @@ WindowSurface::WindowSurface(rx::EGLImplFactory *implFactory,
const AttributeMap &attribs) const AttributeMap &attribs)
: Surface(EGL_WINDOW_BIT, config, attribs) : Surface(EGL_WINDOW_BIT, config, attribs)
{ {
mImplementation = implFactory->createWindowSurface(mState, config, window, attribs); mImplementation = implFactory->createWindowSurface(mState, window, attribs);
} }
WindowSurface::~WindowSurface() WindowSurface::~WindowSurface()
...@@ -303,7 +304,7 @@ PbufferSurface::PbufferSurface(rx::EGLImplFactory *implFactory, ...@@ -303,7 +304,7 @@ PbufferSurface::PbufferSurface(rx::EGLImplFactory *implFactory,
const AttributeMap &attribs) const AttributeMap &attribs)
: Surface(EGL_PBUFFER_BIT, config, attribs) : Surface(EGL_PBUFFER_BIT, config, attribs)
{ {
mImplementation = implFactory->createPbufferSurface(mState, config, attribs); mImplementation = implFactory->createPbufferSurface(mState, attribs);
} }
PbufferSurface::PbufferSurface(rx::EGLImplFactory *implFactory, PbufferSurface::PbufferSurface(rx::EGLImplFactory *implFactory,
...@@ -314,7 +315,7 @@ PbufferSurface::PbufferSurface(rx::EGLImplFactory *implFactory, ...@@ -314,7 +315,7 @@ PbufferSurface::PbufferSurface(rx::EGLImplFactory *implFactory,
: Surface(EGL_PBUFFER_BIT, config, attribs) : Surface(EGL_PBUFFER_BIT, config, attribs)
{ {
mImplementation = mImplementation =
implFactory->createPbufferFromClientBuffer(mState, config, buftype, clientBuffer, attribs); implFactory->createPbufferFromClientBuffer(mState, buftype, clientBuffer, attribs);
} }
PbufferSurface::~PbufferSurface() PbufferSurface::~PbufferSurface()
...@@ -327,7 +328,7 @@ PixmapSurface::PixmapSurface(rx::EGLImplFactory *implFactory, ...@@ -327,7 +328,7 @@ PixmapSurface::PixmapSurface(rx::EGLImplFactory *implFactory,
const AttributeMap &attribs) const AttributeMap &attribs)
: Surface(EGL_PIXMAP_BIT, config, attribs) : Surface(EGL_PIXMAP_BIT, config, attribs)
{ {
mImplementation = implFactory->createPixmapSurface(mState, config, nativePixmap, attribs); mImplementation = implFactory->createPixmapSurface(mState, nativePixmap, attribs);
} }
PixmapSurface::~PixmapSurface() PixmapSurface::~PixmapSurface()
......
src/libANGLE/Surface.h
...@@ -39,9 +39,10 @@ struct Config; ...@@ -39,9 +39,10 @@ struct Config;
struct SurfaceState final : angle::NonCopyable struct SurfaceState final : angle::NonCopyable
{ {
SurfaceState(); SurfaceState(const egl::Config *configIn);
gl::Framebuffer *defaultFramebuffer; gl::Framebuffer *defaultFramebuffer;
const egl::Config *config;
}; };
class Surface : public gl::FramebufferAttachmentObject class Surface : public gl::FramebufferAttachmentObject
...@@ -118,8 +119,6 @@ class Surface : public gl::FramebufferAttachmentObject ...@@ -118,8 +119,6 @@ class Surface : public gl::FramebufferAttachmentObject
EGLint mType; EGLint mType;
const egl::Config *mConfig;
bool mPostSubBufferRequested; bool mPostSubBufferRequested;
bool mFlexibleSurfaceCompatibilityRequested; bool mFlexibleSurfaceCompatibilityRequested;
......
src/libANGLE/Surface_unittest.cpp
...@@ -25,7 +25,7 @@ namespace ...@@ -25,7 +25,7 @@ namespace
class MockSurfaceImpl : public rx::SurfaceImpl class MockSurfaceImpl : public rx::SurfaceImpl
{ {
public: public:
MockSurfaceImpl() : SurfaceImpl(mockState) {} MockSurfaceImpl() : SurfaceImpl(mockState), mockState(nullptr) {}
virtual ~MockSurfaceImpl() { destroy(); } virtual ~MockSurfaceImpl() { destroy(); }
MOCK_METHOD1(initialize, egl::Error(const DisplayImpl *)); MOCK_METHOD1(initialize, egl::Error(const DisplayImpl *));
...@@ -53,7 +53,7 @@ TEST(SurfaceTest, DestructionDeletesImpl) ...@@ -53,7 +53,7 @@ TEST(SurfaceTest, DestructionDeletesImpl)
NiceMock<MockEGLFactory> factory; NiceMock<MockEGLFactory> factory;
MockSurfaceImpl *impl = new MockSurfaceImpl; MockSurfaceImpl *impl = new MockSurfaceImpl;
EXPECT_CALL(factory, createWindowSurface(_, _, _, _)).WillOnce(Return(impl)); EXPECT_CALL(factory, createWindowSurface(_, _, _)).WillOnce(Return(impl));
egl::Config config; egl::Config config;
egl::Surface *surface = new egl::WindowSurface( egl::Surface *surface = new egl::WindowSurface(
......
src/libANGLE/renderer/EGLImplFactory.h
...@@ -39,19 +39,15 @@ class EGLImplFactory : angle::NonCopyable ...@@ -39,19 +39,15 @@ class EGLImplFactory : angle::NonCopyable
virtual ~EGLImplFactory() {} virtual ~EGLImplFactory() {}
virtual SurfaceImpl *createWindowSurface(const egl::SurfaceState &state, virtual SurfaceImpl *createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) = 0; const egl::AttributeMap &attribs) = 0;
virtual SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state, virtual SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) = 0; const egl::AttributeMap &attribs) = 0;
virtual SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state, virtual SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) = 0; const egl::AttributeMap &attribs) = 0;
virtual SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state, virtual SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) = 0; const egl::AttributeMap &attribs) = 0;
......
src/libANGLE/renderer/d3d/DisplayD3D.cpp
...@@ -159,35 +159,30 @@ DisplayD3D::DisplayD3D() : mRenderer(nullptr) ...@@ -159,35 +159,30 @@ DisplayD3D::DisplayD3D() : mRenderer(nullptr)
} }
SurfaceImpl *DisplayD3D::createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayD3D::createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
ASSERT(mRenderer != nullptr); ASSERT(mRenderer != nullptr);
return new WindowSurfaceD3D(state, mRenderer, mDisplay, configuration, window, attribs); return new WindowSurfaceD3D(state, mRenderer, mDisplay, window, attribs);
} }
SurfaceImpl *DisplayD3D::createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayD3D::createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
ASSERT(mRenderer != nullptr); ASSERT(mRenderer != nullptr);
return new PbufferSurfaceD3D(state, mRenderer, mDisplay, configuration, 0, nullptr, attribs); return new PbufferSurfaceD3D(state, mRenderer, mDisplay, 0, nullptr, attribs);
} }
SurfaceImpl *DisplayD3D::createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *DisplayD3D::createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
ASSERT(mRenderer != nullptr); ASSERT(mRenderer != nullptr);
return new PbufferSurfaceD3D(state, mRenderer, mDisplay, configuration, buftype, clientBuffer, return new PbufferSurfaceD3D(state, mRenderer, mDisplay, buftype, clientBuffer, attribs);
attribs);
} }
SurfaceImpl *DisplayD3D::createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayD3D::createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
......
src/libANGLE/renderer/d3d/DisplayD3D.h
...@@ -26,19 +26,15 @@ class DisplayD3D : public DisplayImpl ...@@ -26,19 +26,15 @@ class DisplayD3D : public DisplayImpl
// Surface creation // Surface creation
SurfaceImpl *createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
......
src/libANGLE/renderer/d3d/SurfaceD3D.cpp
...@@ -24,7 +24,6 @@ namespace rx ...@@ -24,7 +24,6 @@ namespace rx
SurfaceD3D::SurfaceD3D(const egl::SurfaceState &state, SurfaceD3D::SurfaceD3D(const egl::SurfaceState &state,
RendererD3D *renderer, RendererD3D *renderer,
egl::Display *display, egl::Display *display,
const egl::Config *config,
EGLNativeWindowType window, EGLNativeWindowType window,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
...@@ -34,11 +33,11 @@ SurfaceD3D::SurfaceD3D(const egl::SurfaceState &state, ...@@ -34,11 +33,11 @@ SurfaceD3D::SurfaceD3D(const egl::SurfaceState &state,
mDisplay(display), mDisplay(display),
mFixedSize(window == nullptr || attribs.get(EGL_FIXED_SIZE_ANGLE, EGL_FALSE) == EGL_TRUE), mFixedSize(window == nullptr || attribs.get(EGL_FIXED_SIZE_ANGLE, EGL_FALSE) == EGL_TRUE),
mOrientation(static_cast<EGLint>(attribs.get(EGL_SURFACE_ORIENTATION_ANGLE, 0))), mOrientation(static_cast<EGLint>(attribs.get(EGL_SURFACE_ORIENTATION_ANGLE, 0))),
mRenderTargetFormat(config->renderTargetFormat), mRenderTargetFormat(state.config->renderTargetFormat),
mDepthStencilFormat(config->depthStencilFormat), mDepthStencilFormat(state.config->depthStencilFormat),
mSwapChain(nullptr), mSwapChain(nullptr),
mSwapIntervalDirty(true), mSwapIntervalDirty(true),
mNativeWindow(renderer->createNativeWindow(window, config, attribs)), mNativeWindow(renderer->createNativeWindow(window, state.config, attribs)),
mWidth(static_cast<EGLint>(attribs.get(EGL_WIDTH, 0))), mWidth(static_cast<EGLint>(attribs.get(EGL_WIDTH, 0))),
mHeight(static_cast<EGLint>(attribs.get(EGL_HEIGHT, 0))), mHeight(static_cast<EGLint>(attribs.get(EGL_HEIGHT, 0))),
mSwapInterval(1), mSwapInterval(1),
...@@ -359,13 +358,11 @@ gl::Error SurfaceD3D::getAttachmentRenderTarget(const gl::FramebufferAttachment: ...@@ -359,13 +358,11 @@ gl::Error SurfaceD3D::getAttachmentRenderTarget(const gl::FramebufferAttachment:
WindowSurfaceD3D::WindowSurfaceD3D(const egl::SurfaceState &state, WindowSurfaceD3D::WindowSurfaceD3D(const egl::SurfaceState &state,
RendererD3D *renderer, RendererD3D *renderer,
egl::Display *display, egl::Display *display,
const egl::Config *config,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
: SurfaceD3D(state, : SurfaceD3D(state,
renderer, renderer,
display, display,
config,
window, window,
0, 0,
static_cast<EGLClientBuffer>(0), static_cast<EGLClientBuffer>(0),
...@@ -380,14 +377,12 @@ WindowSurfaceD3D::~WindowSurfaceD3D() ...@@ -380,14 +377,12 @@ WindowSurfaceD3D::~WindowSurfaceD3D()
PbufferSurfaceD3D::PbufferSurfaceD3D(const egl::SurfaceState &state, PbufferSurfaceD3D::PbufferSurfaceD3D(const egl::SurfaceState &state,
RendererD3D *renderer, RendererD3D *renderer,
egl::Display *display, egl::Display *display,
const egl::Config *config,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
: SurfaceD3D(state, : SurfaceD3D(state,
renderer, renderer,
display, display,
config,
static_cast<EGLNativeWindowType>(0), static_cast<EGLNativeWindowType>(0),
buftype, buftype,
clientBuffer, clientBuffer,
......
src/libANGLE/renderer/d3d/SurfaceD3D.h
...@@ -59,7 +59,6 @@ class SurfaceD3D : public SurfaceImpl ...@@ -59,7 +59,6 @@ class SurfaceD3D : public SurfaceImpl
SurfaceD3D(const egl::SurfaceState &state, SurfaceD3D(const egl::SurfaceState &state,
RendererD3D *renderer, RendererD3D *renderer,
egl::Display *display, egl::Display *display,
const egl::Config *config,
EGLNativeWindowType window, EGLNativeWindowType window,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
...@@ -97,7 +96,6 @@ class WindowSurfaceD3D : public SurfaceD3D ...@@ -97,7 +96,6 @@ class WindowSurfaceD3D : public SurfaceD3D
WindowSurfaceD3D(const egl::SurfaceState &state, WindowSurfaceD3D(const egl::SurfaceState &state,
RendererD3D *renderer, RendererD3D *renderer,
egl::Display *display, egl::Display *display,
const egl::Config *config,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs); const egl::AttributeMap &attribs);
~WindowSurfaceD3D() override; ~WindowSurfaceD3D() override;
...@@ -109,7 +107,6 @@ class PbufferSurfaceD3D : public SurfaceD3D ...@@ -109,7 +107,6 @@ class PbufferSurfaceD3D : public SurfaceD3D
PbufferSurfaceD3D(const egl::SurfaceState &state, PbufferSurfaceD3D(const egl::SurfaceState &state,
RendererD3D *renderer, RendererD3D *renderer,
egl::Display *display, egl::Display *display,
const egl::Config *config,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs); const egl::AttributeMap &attribs);
......
src/libANGLE/renderer/gl/cgl/DisplayCGL.h
...@@ -27,19 +27,15 @@ class DisplayCGL : public DisplayGL ...@@ -27,19 +27,15 @@ class DisplayCGL : public DisplayGL
void terminate() override; void terminate() override;
SurfaceImpl *createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
......
src/libANGLE/renderer/gl/cgl/DisplayCGL.mm
...@@ -110,7 +110,6 @@ void DisplayCGL::terminate() ...@@ -110,7 +110,6 @@ void DisplayCGL::terminate()
} }
SurfaceImpl *DisplayCGL::createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayCGL::createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
...@@ -118,7 +117,6 @@ SurfaceImpl *DisplayCGL::createWindowSurface(const egl::SurfaceState &state, ...@@ -118,7 +117,6 @@ SurfaceImpl *DisplayCGL::createWindowSurface(const egl::SurfaceState &state,
} }
SurfaceImpl *DisplayCGL::createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayCGL::createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
EGLint width = static_cast<EGLint>(attribs.get(EGL_WIDTH, 0)); EGLint width = static_cast<EGLint>(attribs.get(EGL_WIDTH, 0));
...@@ -127,7 +125,6 @@ SurfaceImpl *DisplayCGL::createPbufferSurface(const egl::SurfaceState &state, ...@@ -127,7 +125,6 @@ SurfaceImpl *DisplayCGL::createPbufferSurface(const egl::SurfaceState &state,
} }
SurfaceImpl *DisplayCGL::createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *DisplayCGL::createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
...@@ -137,7 +134,6 @@ SurfaceImpl *DisplayCGL::createPbufferFromClientBuffer(const egl::SurfaceState & ...@@ -137,7 +134,6 @@ SurfaceImpl *DisplayCGL::createPbufferFromClientBuffer(const egl::SurfaceState &
} }
SurfaceImpl *DisplayCGL::createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayCGL::createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
......
src/libANGLE/renderer/gl/egl/android/DisplayAndroid.cpp
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include "common/debug.h" #include "common/debug.h"
#include "libANGLE/Display.h" #include "libANGLE/Display.h"
#include "libANGLE/Surface.h"
#include "libANGLE/renderer/gl/renderergl_utils.h" #include "libANGLE/renderer/gl/renderergl_utils.h"
#include "libANGLE/renderer/gl/egl/android/DisplayAndroid.h" #include "libANGLE/renderer/gl/egl/android/DisplayAndroid.h"
#include "libANGLE/renderer/gl/egl/FunctionsEGLDL.h" #include "libANGLE/renderer/gl/egl/FunctionsEGLDL.h"
...@@ -147,7 +148,6 @@ void DisplayAndroid::terminate() ...@@ -147,7 +148,6 @@ void DisplayAndroid::terminate()
} }
SurfaceImpl *DisplayAndroid::createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayAndroid::createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
...@@ -155,8 +155,7 @@ SurfaceImpl *DisplayAndroid::createWindowSurface(const egl::SurfaceState &state, ...@@ -155,8 +155,7 @@ SurfaceImpl *DisplayAndroid::createWindowSurface(const egl::SurfaceState &state,
EGLint numConfig; EGLint numConfig;
EGLBoolean success; EGLBoolean success;
const EGLint configAttribList[] = {EGL_CONFIG_ID, mConfigIds[configuration->configID], const EGLint configAttribList[] = {EGL_CONFIG_ID, mConfigIds[state.config->configID], EGL_NONE};
EGL_NONE};
success = mEGL->chooseConfig(configAttribList, &config, 1, &numConfig); success = mEGL->chooseConfig(configAttribList, &config, 1, &numConfig);
ASSERT(success && numConfig == 1); ASSERT(success && numConfig == 1);
...@@ -165,15 +164,13 @@ SurfaceImpl *DisplayAndroid::createWindowSurface(const egl::SurfaceState &state, ...@@ -165,15 +164,13 @@ SurfaceImpl *DisplayAndroid::createWindowSurface(const egl::SurfaceState &state,
} }
SurfaceImpl *DisplayAndroid::createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayAndroid::createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
EGLConfig config; EGLConfig config;
EGLint numConfig; EGLint numConfig;
EGLBoolean success; EGLBoolean success;
const EGLint configAttribList[] = {EGL_CONFIG_ID, mConfigIds[configuration->configID], const EGLint configAttribList[] = {EGL_CONFIG_ID, mConfigIds[state.config->configID], EGL_NONE};
EGL_NONE};
success = mEGL->chooseConfig(configAttribList, &config, 1, &numConfig); success = mEGL->chooseConfig(configAttribList, &config, 1, &numConfig);
ASSERT(success && numConfig == 1); ASSERT(success && numConfig == 1);
...@@ -182,7 +179,6 @@ SurfaceImpl *DisplayAndroid::createPbufferSurface(const egl::SurfaceState &state ...@@ -182,7 +179,6 @@ SurfaceImpl *DisplayAndroid::createPbufferSurface(const egl::SurfaceState &state
} }
SurfaceImpl *DisplayAndroid::createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *DisplayAndroid::createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
...@@ -192,7 +188,6 @@ SurfaceImpl *DisplayAndroid::createPbufferFromClientBuffer(const egl::SurfaceSta ...@@ -192,7 +188,6 @@ SurfaceImpl *DisplayAndroid::createPbufferFromClientBuffer(const egl::SurfaceSta
} }
SurfaceImpl *DisplayAndroid::createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayAndroid::createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
......
src/libANGLE/renderer/gl/egl/android/DisplayAndroid.h
...@@ -28,19 +28,15 @@ class DisplayAndroid : public DisplayEGL ...@@ -28,19 +28,15 @@ class DisplayAndroid : public DisplayEGL
void terminate() override; void terminate() override;
SurfaceImpl *createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
......
src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp
...@@ -829,7 +829,6 @@ void DisplayOzone::terminate() ...@@ -829,7 +829,6 @@ void DisplayOzone::terminate()
} }
SurfaceImpl *DisplayOzone::createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayOzone::createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
...@@ -843,7 +842,6 @@ SurfaceImpl *DisplayOzone::createWindowSurface(const egl::SurfaceState &state, ...@@ -843,7 +842,6 @@ SurfaceImpl *DisplayOzone::createWindowSurface(const egl::SurfaceState &state,
} }
SurfaceImpl *DisplayOzone::createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayOzone::createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
EGLAttrib width = attribs.get(EGL_WIDTH, 0); EGLAttrib width = attribs.get(EGL_WIDTH, 0);
...@@ -858,7 +856,6 @@ SurfaceImpl *DisplayOzone::createPbufferSurface(const egl::SurfaceState &state, ...@@ -858,7 +856,6 @@ SurfaceImpl *DisplayOzone::createPbufferSurface(const egl::SurfaceState &state,
} }
SurfaceImpl *DisplayOzone::createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *DisplayOzone::createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
...@@ -868,7 +865,6 @@ SurfaceImpl *DisplayOzone::createPbufferFromClientBuffer(const egl::SurfaceState ...@@ -868,7 +865,6 @@ SurfaceImpl *DisplayOzone::createPbufferFromClientBuffer(const egl::SurfaceState
} }
SurfaceImpl *DisplayOzone::createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayOzone::createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
......
src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.h
...@@ -114,19 +114,15 @@ class DisplayOzone final : public DisplayEGL ...@@ -114,19 +114,15 @@ class DisplayOzone final : public DisplayEGL
void terminate() override; void terminate() override;
SurfaceImpl *createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
......
src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
...@@ -382,23 +382,21 @@ void DisplayGLX::terminate() ...@@ -382,23 +382,21 @@ void DisplayGLX::terminate()
} }
SurfaceImpl *DisplayGLX::createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayGLX::createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
ASSERT(configIdToGLXConfig.count(configuration->configID) > 0); ASSERT(configIdToGLXConfig.count(state.config->configID) > 0);
glx::FBConfig fbConfig = configIdToGLXConfig[configuration->configID]; glx::FBConfig fbConfig = configIdToGLXConfig[state.config->configID];
return new WindowSurfaceGLX(state, mGLX, this, getRenderer(), window, mGLX.getDisplay(), return new WindowSurfaceGLX(state, mGLX, this, getRenderer(), window, mGLX.getDisplay(),
mContext, fbConfig); mContext, fbConfig);
} }
SurfaceImpl *DisplayGLX::createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayGLX::createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
ASSERT(configIdToGLXConfig.count(configuration->configID) > 0); ASSERT(configIdToGLXConfig.count(state.config->configID) > 0);
glx::FBConfig fbConfig = configIdToGLXConfig[configuration->configID]; glx::FBConfig fbConfig = configIdToGLXConfig[state.config->configID];
EGLint width = static_cast<EGLint>(attribs.get(EGL_WIDTH, 0)); EGLint width = static_cast<EGLint>(attribs.get(EGL_WIDTH, 0));
EGLint height = static_cast<EGLint>(attribs.get(EGL_HEIGHT, 0)); EGLint height = static_cast<EGLint>(attribs.get(EGL_HEIGHT, 0));
...@@ -409,7 +407,6 @@ SurfaceImpl *DisplayGLX::createPbufferSurface(const egl::SurfaceState &state, ...@@ -409,7 +407,6 @@ SurfaceImpl *DisplayGLX::createPbufferSurface(const egl::SurfaceState &state,
} }
SurfaceImpl *DisplayGLX::createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *DisplayGLX::createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
...@@ -419,7 +416,6 @@ SurfaceImpl *DisplayGLX::createPbufferFromClientBuffer(const egl::SurfaceState & ...@@ -419,7 +416,6 @@ SurfaceImpl *DisplayGLX::createPbufferFromClientBuffer(const egl::SurfaceState &
} }
SurfaceImpl *DisplayGLX::createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayGLX::createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
......
src/libANGLE/renderer/gl/glx/DisplayGLX.h
...@@ -45,19 +45,15 @@ class DisplayGLX : public DisplayGL ...@@ -45,19 +45,15 @@ class DisplayGLX : public DisplayGL
void terminate() override; void terminate() override;
SurfaceImpl *createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
......
src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp
...@@ -431,7 +431,6 @@ void DisplayWGL::terminate() ...@@ -431,7 +431,6 @@ void DisplayWGL::terminate()
} }
SurfaceImpl *DisplayWGL::createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayWGL::createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
...@@ -450,7 +449,6 @@ SurfaceImpl *DisplayWGL::createWindowSurface(const egl::SurfaceState &state, ...@@ -450,7 +449,6 @@ SurfaceImpl *DisplayWGL::createWindowSurface(const egl::SurfaceState &state,
} }
SurfaceImpl *DisplayWGL::createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayWGL::createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
EGLint width = static_cast<EGLint>(attribs.get(EGL_WIDTH, 0)); EGLint width = static_cast<EGLint>(attribs.get(EGL_WIDTH, 0));
...@@ -464,7 +462,6 @@ SurfaceImpl *DisplayWGL::createPbufferSurface(const egl::SurfaceState &state, ...@@ -464,7 +462,6 @@ SurfaceImpl *DisplayWGL::createPbufferSurface(const egl::SurfaceState &state,
} }
SurfaceImpl *DisplayWGL::createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *DisplayWGL::createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
...@@ -475,7 +472,6 @@ SurfaceImpl *DisplayWGL::createPbufferFromClientBuffer(const egl::SurfaceState & ...@@ -475,7 +472,6 @@ SurfaceImpl *DisplayWGL::createPbufferFromClientBuffer(const egl::SurfaceState &
} }
SurfaceImpl *DisplayWGL::createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayWGL::createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
......
src/libANGLE/renderer/gl/wgl/DisplayWGL.h
...@@ -29,19 +29,15 @@ class DisplayWGL : public DisplayGL ...@@ -29,19 +29,15 @@ class DisplayWGL : public DisplayGL
// Surface creation // Surface creation
SurfaceImpl *createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
......
src/libANGLE/renderer/null/DisplayNULL.cpp
...@@ -132,7 +132,6 @@ gl::Version DisplayNULL::getMaxSupportedESVersion() const ...@@ -132,7 +132,6 @@ gl::Version DisplayNULL::getMaxSupportedESVersion() const
} }
SurfaceImpl *DisplayNULL::createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayNULL::createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
...@@ -140,14 +139,12 @@ SurfaceImpl *DisplayNULL::createWindowSurface(const egl::SurfaceState &state, ...@@ -140,14 +139,12 @@ SurfaceImpl *DisplayNULL::createWindowSurface(const egl::SurfaceState &state,
} }
SurfaceImpl *DisplayNULL::createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayNULL::createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
return new SurfaceNULL(state); return new SurfaceNULL(state);
} }
SurfaceImpl *DisplayNULL::createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *DisplayNULL::createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer buffer, EGLClientBuffer buffer,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
...@@ -156,7 +153,6 @@ SurfaceImpl *DisplayNULL::createPbufferFromClientBuffer(const egl::SurfaceState ...@@ -156,7 +153,6 @@ SurfaceImpl *DisplayNULL::createPbufferFromClientBuffer(const egl::SurfaceState
} }
SurfaceImpl *DisplayNULL::createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayNULL::createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
......
src/libANGLE/renderer/null/DisplayNULL.h
...@@ -46,19 +46,15 @@ class DisplayNULL : public DisplayImpl ...@@ -46,19 +46,15 @@ class DisplayNULL : public DisplayImpl
gl::Version getMaxSupportedESVersion() const override; gl::Version getMaxSupportedESVersion() const override;
SurfaceImpl *createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer buffer, EGLClientBuffer buffer,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
......
src/libANGLE/renderer/vulkan/DisplayVk.cpp
...@@ -93,7 +93,6 @@ egl::Error DisplayVk::waitNative(EGLint engine, ...@@ -93,7 +93,6 @@ egl::Error DisplayVk::waitNative(EGLint engine,
} }
SurfaceImpl *DisplayVk::createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayVk::createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
...@@ -102,7 +101,6 @@ SurfaceImpl *DisplayVk::createWindowSurface(const egl::SurfaceState &state, ...@@ -102,7 +101,6 @@ SurfaceImpl *DisplayVk::createWindowSurface(const egl::SurfaceState &state,
} }
SurfaceImpl *DisplayVk::createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayVk::createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
UNIMPLEMENTED(); UNIMPLEMENTED();
...@@ -110,7 +108,6 @@ SurfaceImpl *DisplayVk::createPbufferSurface(const egl::SurfaceState &state, ...@@ -110,7 +108,6 @@ SurfaceImpl *DisplayVk::createPbufferSurface(const egl::SurfaceState &state,
} }
SurfaceImpl *DisplayVk::createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *DisplayVk::createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
...@@ -120,7 +117,6 @@ SurfaceImpl *DisplayVk::createPbufferFromClientBuffer(const egl::SurfaceState &s ...@@ -120,7 +117,6 @@ SurfaceImpl *DisplayVk::createPbufferFromClientBuffer(const egl::SurfaceState &s
} }
SurfaceImpl *DisplayVk::createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *DisplayVk::createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) const egl::AttributeMap &attribs)
{ {
......
src/libANGLE/renderer/vulkan/DisplayVk.h
...@@ -46,19 +46,15 @@ class DisplayVk : public DisplayImpl ...@@ -46,19 +46,15 @@ class DisplayVk : public DisplayImpl
egl::Surface *readSurface) const override; egl::Surface *readSurface) const override;
SurfaceImpl *createWindowSurface(const egl::SurfaceState &state, SurfaceImpl *createWindowSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLNativeWindowType window, EGLNativeWindowType window,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state, SurfaceImpl *createPbufferSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state, SurfaceImpl *createPbufferFromClientBuffer(const egl::SurfaceState &state,
const egl::Config *configuration,
EGLenum buftype, EGLenum buftype,
EGLClientBuffer clientBuffer, EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state, SurfaceImpl *createPixmapSurface(const egl::SurfaceState &state,
const egl::Config *configuration,
NativePixmapType nativePixmap, NativePixmapType nativePixmap,
const egl::AttributeMap &attribs) override; const egl::AttributeMap &attribs) override;
......
src/tests/angle_unittests_utils.h
...@@ -94,24 +94,19 @@ class MockGLFactory : public GLImplFactory ...@@ -94,24 +94,19 @@ class MockGLFactory : public GLImplFactory
class MockEGLFactory : public EGLImplFactory class MockEGLFactory : public EGLImplFactory
{ {
public: public:
MOCK_METHOD4(createWindowSurface, MOCK_METHOD3(createWindowSurface,
SurfaceImpl *(const egl::SurfaceState &, SurfaceImpl *(const egl::SurfaceState &,
const egl::Config *,
EGLNativeWindowType, EGLNativeWindowType,
const egl::AttributeMap &)); const egl::AttributeMap &));
MOCK_METHOD3(createPbufferSurface, MOCK_METHOD2(createPbufferSurface,
SurfaceImpl *(const egl::SurfaceState &, const egl::AttributeMap &));
MOCK_METHOD4(createPbufferFromClientBuffer,
SurfaceImpl *(const egl::SurfaceState &, SurfaceImpl *(const egl::SurfaceState &,
const egl::Config *,
const egl::AttributeMap &));
MOCK_METHOD5(createPbufferFromClientBuffer,
SurfaceImpl *(const egl::SurfaceState &,
const egl::Config *,
EGLenum, EGLenum,
EGLClientBuffer, EGLClientBuffer,
const egl::AttributeMap &)); const egl::AttributeMap &));
MOCK_METHOD4(createPixmapSurface, MOCK_METHOD3(createPixmapSurface,
SurfaceImpl *(const egl::SurfaceState &, SurfaceImpl *(const egl::SurfaceState &,
const egl::Config *,
NativePixmapType, NativePixmapType,
const egl::AttributeMap &)); const egl::AttributeMap &));
MOCK_METHOD3(createImage, ImageImpl *(EGLenum, egl::ImageSibling *, const egl::AttributeMap &)); MOCK_METHOD3(createImage, ImageImpl *(EGLenum, egl::ImageSibling *, const egl::AttributeMap &));
......
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