Skip to content

A
angle
Commit 62af5467 by Jamie Madill
Options

Use EGLWindow in ANGLETests.

This completes the refactor to use the same code for EGL and OS Window creation for samples and tests. BUG=angle:730 TEST=angle_tests Change-Id: Ib6de89f5bf83c0730a66f662cd1f87351f36a5f7 Reviewed-on: https://chromium-review.googlesource.com/213297Tested-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 0063c517
Showing with 30 additions and 202 deletions
tests/angle_tests/ANGLETest.cpp
#include "ANGLETest.h" #include "ANGLETest.h"
#include "EGLWindow.h"
#include "OSWindow.h" #include "OSWindow.h"
OSWindow *ANGLETest::mOSWindow = NULL; OSWindow *ANGLETest::mOSWindow = NULL;
ANGLETest::ANGLETest() ANGLETest::ANGLETest()
: mTestPlatform(EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE), : mEGLWindow(NULL)
mClientVersion(2),
mWidth(1280),
mHeight(720),
mRedBits(-1),
mGreenBits(-1),
mBlueBits(-1),
mAlphaBits(-1),
mDepthBits(-1),
mStencilBits(-1),
mMultisample(false),
mConfig(0),
mSurface(EGL_NO_SURFACE),
mContext(EGL_NO_CONTEXT),
mDisplay(EGL_NO_DISPLAY)
{ {
mEGLWindow = new EGLWindow(1280, 720, 2, EGL_PLATFORM_ANGLE_TYPE_D3D11_ANGLE);
} }
void ANGLETest::SetUp() void ANGLETest::SetUp()
{ {
ResizeWindow(mWidth, mHeight); ResizeWindow(mEGLWindow->getWidth(), mEGLWindow->getHeight());
if (!createEGLContext()) if (!createEGLContext())
{ {
FAIL() << "egl context creation failed."; FAIL() << "egl context creation failed.";
...@@ -52,7 +40,7 @@ void ANGLETest::TearDown() ...@@ -52,7 +40,7 @@ void ANGLETest::TearDown()
void ANGLETest::swapBuffers() void ANGLETest::swapBuffers()
{ {
eglSwapBuffers(mDisplay, mSurface); mEGLWindow->swap();
} }
void ANGLETest::drawQuad(GLuint program, const std::string& positionAttribName, GLfloat quadDepth) void ANGLETest::drawQuad(GLuint program, const std::string& positionAttribName, GLfloat quadDepth)
...@@ -162,226 +150,82 @@ bool ANGLETest::extensionEnabled(const std::string &extName) ...@@ -162,226 +150,82 @@ bool ANGLETest::extensionEnabled(const std::string &extName)
void ANGLETest::setClientVersion(int clientVersion) void ANGLETest::setClientVersion(int clientVersion)
{ {
mClientVersion = clientVersion; mEGLWindow->setClientVersion(clientVersion);
} }
void ANGLETest::setWindowWidth(int width) void ANGLETest::setWindowWidth(int width)
{ {
mWidth = width; mEGLWindow->setWidth(width);
} }
void ANGLETest::setWindowHeight(int height) void ANGLETest::setWindowHeight(int height)
{ {
mHeight = height; mEGLWindow->setHeight(height);
} }
void ANGLETest::setConfigRedBits(int bits) void ANGLETest::setConfigRedBits(int bits)
{ {
mRedBits = bits; mEGLWindow->setConfigRedBits(bits);
} }
void ANGLETest::setConfigGreenBits(int bits) void ANGLETest::setConfigGreenBits(int bits)
{ {
mGreenBits = bits; mEGLWindow->setConfigGreenBits(bits);
} }
void ANGLETest::setConfigBlueBits(int bits) void ANGLETest::setConfigBlueBits(int bits)
{ {
mBlueBits = bits; mEGLWindow->setConfigBlueBits(bits);
} }
void ANGLETest::setConfigAlphaBits(int bits) void ANGLETest::setConfigAlphaBits(int bits)
{ {
mAlphaBits = bits; mEGLWindow->setConfigAlphaBits(bits);
} }
void ANGLETest::setConfigDepthBits(int bits) void ANGLETest::setConfigDepthBits(int bits)
{ {
mDepthBits = bits; mEGLWindow->setConfigDepthBits(bits);
} }
void ANGLETest::setConfigStencilBits(int bits) void ANGLETest::setConfigStencilBits(int bits)
{ {
mStencilBits = bits; mEGLWindow->setConfigStencilBits(bits);
} }
void ANGLETest::setMultisampleEnabled(bool enabled) void ANGLETest::setMultisampleEnabled(bool enabled)
{ {
mMultisample = enabled; mEGLWindow->setMultisample(enabled);
} }
int ANGLETest::getClientVersion() const int ANGLETest::getClientVersion() const
{ {
return mClientVersion; return mEGLWindow->getClientVersion();
} }
int ANGLETest::getWindowWidth() const int ANGLETest::getWindowWidth() const
{ {
return mWidth; return mEGLWindow->getWidth();
} }
int ANGLETest::getWindowHeight() const int ANGLETest::getWindowHeight() const
{ {
return mHeight; return mEGLWindow->getHeight();
}
int ANGLETest::getConfigRedBits() const
{
return mRedBits;
}
int ANGLETest::getConfigGreenBits() const
{
return mGreenBits;
}
int ANGLETest::getConfigBlueBits() const
{
return mBlueBits;
}
int ANGLETest::getConfigAlphaBits() const
{
return mAlphaBits;
}
int ANGLETest::getConfigDepthBits() const
{
return mDepthBits;
}
int ANGLETest::getConfigStencilBits() const
{
return mStencilBits;
} }
bool ANGLETest::isMultisampleEnabled() const bool ANGLETest::isMultisampleEnabled() const
{ {
return mMultisample; return mEGLWindow->isMultisample();
} }
bool ANGLETest::createEGLContext() bool ANGLETest::createEGLContext()
{ {
PFNEGLGETPLATFORMDISPLAYEXTPROC eglGetPlatformDisplayEXT = reinterpret_cast<PFNEGLGETPLATFORMDISPLAYEXTPROC>(eglGetProcAddress("eglGetPlatformDisplayEXT")); return mEGLWindow->initializeGL(mOSWindow);
if (!eglGetPlatformDisplayEXT)
{
return false;
}
const EGLint displayAttributes[] =
{
EGL_PLATFORM_ANGLE_TYPE_ANGLE, mTestPlatform,
EGL_NONE,
};
mDisplay = eglGetPlatformDisplayEXT(EGL_PLATFORM_ANGLE_ANGLE, mOSWindow->getNativeDisplay(), displayAttributes);
if (mDisplay == EGL_NO_DISPLAY)
{
destroyEGLContext();
return false;
}
EGLint majorVersion, minorVersion;
if (!eglInitialize(mDisplay, &majorVersion, &minorVersion))
{
destroyEGLContext();
return false;
}
eglBindAPI(EGL_OPENGL_ES_API);
if (eglGetError() != EGL_SUCCESS)
{
destroyEGLContext();
return false;
}
const EGLint configAttributes[] =
{
EGL_RED_SIZE, (mRedBits >= 0) ? mRedBits : EGL_DONT_CARE,
EGL_GREEN_SIZE, (mGreenBits >= 0) ? mGreenBits : EGL_DONT_CARE,
EGL_BLUE_SIZE, (mBlueBits >= 0) ? mBlueBits : EGL_DONT_CARE,
EGL_ALPHA_SIZE, (mAlphaBits >= 0) ? mAlphaBits : EGL_DONT_CARE,
EGL_DEPTH_SIZE, (mDepthBits >= 0) ? mDepthBits : EGL_DONT_CARE,
EGL_STENCIL_SIZE, (mStencilBits >= 0) ? mStencilBits : EGL_DONT_CARE,
EGL_SAMPLE_BUFFERS, mMultisample ? 1 : 0,
EGL_NONE
};
EGLint configCount;
if (!eglChooseConfig(mDisplay, configAttributes, &mConfig, 1, &configCount) || (configCount != 1))
{
destroyEGLContext();
return false;
}
eglGetConfigAttrib(mDisplay, mConfig, EGL_RED_SIZE, &mRedBits);
eglGetConfigAttrib(mDisplay, mConfig, EGL_GREEN_SIZE, &mGreenBits);
eglGetConfigAttrib(mDisplay, mConfig, EGL_BLUE_SIZE, &mBlueBits);
eglGetConfigAttrib(mDisplay, mConfig, EGL_ALPHA_SIZE, &mBlueBits);
eglGetConfigAttrib(mDisplay, mConfig, EGL_DEPTH_SIZE, &mDepthBits);
eglGetConfigAttrib(mDisplay, mConfig, EGL_STENCIL_SIZE, &mStencilBits);
EGLint samples;
eglGetConfigAttrib(mDisplay, mConfig, EGL_SAMPLE_BUFFERS, &samples);
mMultisample = (samples != 0);
mSurface = eglCreateWindowSurface(mDisplay, mConfig, mOSWindow->getNativeWindow(), NULL);
if(mSurface == EGL_NO_SURFACE)
{
eglGetError(); // Clear error
mSurface = eglCreateWindowSurface(mDisplay, mConfig, NULL, NULL);
}
if (eglGetError() != EGL_SUCCESS)
{
destroyEGLContext();
return false;
}
EGLint contextAttibutes[] =
{
EGL_CONTEXT_CLIENT_VERSION, mClientVersion,
EGL_NONE
};
mContext = eglCreateContext(mDisplay, mConfig, NULL, contextAttibutes);
if (eglGetError() != EGL_SUCCESS)
{
destroyEGLContext();
return false;
}
eglMakeCurrent(mDisplay, mSurface, mSurface, mContext);
if (eglGetError() != EGL_SUCCESS)
{
destroyEGLContext();
return false;
}
return true;
} }
bool ANGLETest::destroyEGLContext() bool ANGLETest::destroyEGLContext()
{ {
if (mDisplay != EGL_NO_DISPLAY) mEGLWindow->destroyGL();
{
eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
if (mSurface != EGL_NO_SURFACE)
{
eglDestroySurface(mDisplay, mSurface);
mSurface = EGL_NO_SURFACE;
}
if (mContext != EGL_NO_CONTEXT)
{
eglDestroyContext(mDisplay, mContext);
mContext = EGL_NO_CONTEXT;
}
eglTerminate(mDisplay);
mDisplay = EGL_NO_DISPLAY;
}
return true; return true;
} }
......
tests/angle_tests/ANGLETest.h
...@@ -12,8 +12,6 @@ ...@@ -12,8 +12,6 @@
#define GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES
#include "angle_gl.h" #include "angle_gl.h"
#include <EGL/egl.h>
#include <EGL/eglext.h>
#include <algorithm> #include <algorithm>
#define EXPECT_GL_ERROR(err) EXPECT_EQ((err), glGetError()) #define EXPECT_GL_ERROR(err) EXPECT_EQ((err), glGetError())
...@@ -35,6 +33,7 @@ ...@@ -35,6 +33,7 @@
#define SHADER_SOURCE(...) #__VA_ARGS__ #define SHADER_SOURCE(...) #__VA_ARGS__
class EGLWindow;
class OSWindow; class OSWindow;
class ANGLETest : public testing::Test class ANGLETest : public testing::Test
...@@ -72,35 +71,13 @@ class ANGLETest : public testing::Test ...@@ -72,35 +71,13 @@ class ANGLETest : public testing::Test
int getClientVersion() const; int getClientVersion() const;
int getWindowWidth() const; int getWindowWidth() const;
int getWindowHeight() const; int getWindowHeight() const;
int getConfigRedBits() const;
int getConfigGreenBits() const;
int getConfigBlueBits() const;
int getConfigAlphaBits() const;
int getConfigDepthBits() const;
int getConfigStencilBits() const;
bool isMultisampleEnabled() const; bool isMultisampleEnabled() const;
private: private:
bool createEGLContext(); bool createEGLContext();
bool destroyEGLContext(); bool destroyEGLContext();
EGLint mTestPlatform; EGLWindow *mEGLWindow;
int mClientVersion;
int mWidth;
int mHeight;
int mRedBits;
int mGreenBits;
int mBlueBits;
int mAlphaBits;
int mDepthBits;
int mStencilBits;
bool mMultisample;
EGLConfig mConfig;
EGLSurface mSurface;
EGLContext mContext;
EGLDisplay mDisplay;
static OSWindow *mOSWindow; static OSWindow *mOSWindow;
}; };
......
tests/angle_tests/OcclusionQueriesTest.cpp
#include "ANGLETest.h" #include "ANGLETest.h"
// Needed for Sleep()
#include <Windows.h>
class OcclusionQueriesTest : public ANGLETest class OcclusionQueriesTest : public ANGLETest
{ {
protected: protected:
......
util/EGLWindow.h
...@@ -38,6 +38,9 @@ class EGLWindow ...@@ -38,6 +38,9 @@ class EGLWindow
~EGLWindow(); ~EGLWindow();
void setClientVersion(EGLint glesMajorVersion) { mClientVersion = glesMajorVersion; }
void setWidth(size_t width) { mWidth = width; }
void setHeight(size_t height) { mHeight = height; }
void setConfigRedBits(int bits) { mRedBits = bits; } void setConfigRedBits(int bits) { mRedBits = bits; }
void setConfigGreenBits(int bits) { mGreenBits = bits; } void setConfigGreenBits(int bits) { mGreenBits = bits; }
void setConfigBlueBits(int bits) { mBlueBits = bits; } void setConfigBlueBits(int bits) { mBlueBits = bits; }
...@@ -49,6 +52,7 @@ class EGLWindow ...@@ -49,6 +52,7 @@ class EGLWindow
void swap(); void swap();
GLuint getClientVersion() const { return mClientVersion; }
EGLConfig getConfig() const; EGLConfig getConfig() const;
EGLDisplay getDisplay() const; EGLDisplay getDisplay() const;
EGLSurface getSurface() const; EGLSurface getSurface() const;
......
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