Skip to content

A
angle
Commit e1a057e8 by Geoff Lang Committed by Commit Bot
Options

Fully format some files.

Change-Id: Id6ea245849696d4c6d7eabc6860c0ac424dd8013 Reviewed-on: https://chromium-review.googlesource.com/1091309Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>
parent 74be296b
Showing with 336 additions and 156 deletions
src/libANGLE/Device.cpp
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#include <iterator> #include <iterator>
#include <platform/Platform.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include <platform/Platform.h>
#include "common/debug.h" #include "common/debug.h"
#include "common/platform.h" #include "common/platform.h"
...@@ -31,7 +31,8 @@ static std::string GenerateExtensionsString(const T &extensions) ...@@ -31,7 +31,8 @@ static std::string GenerateExtensionsString(const T &extensions)
std::vector<std::string> extensionsVector = extensions.getStrings(); std::vector<std::string> extensionsVector = extensions.getStrings();
std::ostringstream stream; std::ostringstream stream;
std::copy(extensionsVector.begin(), extensionsVector.end(), std::ostream_iterator<std::string>(stream, " ")); std::copy(extensionsVector.begin(), extensionsVector.end(),
std::ostream_iterator<std::string>(stream, " "));
return stream.str(); return stream.str();
} }
...@@ -117,5 +118,4 @@ const std::string &Device::getExtensionString() const ...@@ -117,5 +118,4 @@ const std::string &Device::getExtensionString() const
{ {
return mDeviceExtensionString; return mDeviceExtensionString;
} }
} }
src/libANGLE/Device.h
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
#define LIBANGLE_DEVICE_H_ #define LIBANGLE_DEVICE_H_
#include "common/angleutils.h" #include "common/angleutils.h"
#include "libANGLE/Error.h"
#include "libANGLE/Display.h" #include "libANGLE/Display.h"
#include "libANGLE/Error.h"
#include <memory> #include <memory>
...@@ -50,7 +50,6 @@ class Device final : angle::NonCopyable ...@@ -50,7 +50,6 @@ class Device final : angle::NonCopyable
DeviceExtensions mDeviceExtensions; DeviceExtensions mDeviceExtensions;
std::string mDeviceExtensionString; std::string mDeviceExtensionString;
}; };
} }
#endif // LIBANGLE_DEVICE_H_ #endif // LIBANGLE_DEVICE_H_
src/libANGLE/Display.cpp
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include <platform/Platform.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include <platform/Platform.h>
#include "common/debug.h" #include "common/debug.h"
#include "common/mathutil.h" #include "common/mathutil.h"
...@@ -36,23 +36,23 @@ ...@@ -36,23 +36,23 @@
#include "third_party/trace_event/trace_event.h" #include "third_party/trace_event/trace_event.h"
#if defined(ANGLE_ENABLE_D3D9) || defined(ANGLE_ENABLE_D3D11) #if defined(ANGLE_ENABLE_D3D9) || defined(ANGLE_ENABLE_D3D11)
# include "libANGLE/renderer/d3d/DisplayD3D.h" #include "libANGLE/renderer/d3d/DisplayD3D.h"
#endif #endif
#if defined(ANGLE_ENABLE_OPENGL) #if defined(ANGLE_ENABLE_OPENGL)
# if defined(ANGLE_PLATFORM_WINDOWS) #if defined(ANGLE_PLATFORM_WINDOWS)
# include "libANGLE/renderer/gl/wgl/DisplayWGL.h" #include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
# elif defined(ANGLE_USE_X11) #elif defined(ANGLE_USE_X11)
# include "libANGLE/renderer/gl/glx/DisplayGLX.h" #include "libANGLE/renderer/gl/glx/DisplayGLX.h"
# elif defined(ANGLE_PLATFORM_APPLE) #elif defined(ANGLE_PLATFORM_APPLE)
# include "libANGLE/renderer/gl/cgl/DisplayCGL.h" #include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
# elif defined(ANGLE_USE_OZONE) #elif defined(ANGLE_USE_OZONE)
# include "libANGLE/renderer/gl/egl/ozone/DisplayOzone.h" #include "libANGLE/renderer/gl/egl/ozone/DisplayOzone.h"
# elif defined(ANGLE_PLATFORM_ANDROID) #elif defined(ANGLE_PLATFORM_ANDROID)
# include "libANGLE/renderer/gl/egl/android/DisplayAndroid.h" #include "libANGLE/renderer/gl/egl/android/DisplayAndroid.h"
# else #else
# error Unsupported OpenGL platform. #error Unsupported OpenGL platform.
# endif #endif
#endif #endif
#if defined(ANGLE_ENABLE_NULL) #if defined(ANGLE_ENABLE_NULL)
...@@ -77,7 +77,7 @@ namespace egl ...@@ -77,7 +77,7 @@ namespace egl
namespace namespace
{ {
typedef std::map<EGLNativeWindowType, Surface*> WindowSurfaceMap; typedef std::map<EGLNativeWindowType, Surface *> WindowSurfaceMap;
// Get a map of all EGL window surfaces to validate that no window has more than one EGL surface // Get a map of all EGL window surfaces to validate that no window has more than one EGL surface
// associated with it. // associated with it.
static WindowSurfaceMap *GetWindowSurfaces() static WindowSurfaceMap *GetWindowSurfaces()
...@@ -592,7 +592,7 @@ Error Display::terminate() ...@@ -592,7 +592,7 @@ Error Display::terminate()
return NoError(); return NoError();
} }
std::vector<const Config*> Display::getConfigs(const egl::AttributeMap &attribs) const std::vector<const Config *> Display::getConfigs(const egl::AttributeMap &attribs) const
{ {
return mConfigSet.filter(attribs); return mConfigSet.filter(attribs);
} }
...@@ -825,7 +825,8 @@ Error Display::restoreLostDevice() ...@@ -825,7 +825,8 @@ Error Display::restoreLostDevice()
{ {
if ((*ctx)->isResetNotificationEnabled()) if ((*ctx)->isResetNotificationEnabled())
{ {
// If reset notifications have been requested, application must delete all contexts first // If reset notifications have been requested, application must delete all contexts
// first
return EglContextLost(); return EglContextLost();
} }
} }
...@@ -841,7 +842,8 @@ Error Display::destroySurface(Surface *surface) ...@@ -841,7 +842,8 @@ Error Display::destroySurface(Surface *surface)
ASSERT(windowSurfaces); ASSERT(windowSurfaces);
bool surfaceRemoved = false; bool surfaceRemoved = false;
for (WindowSurfaceMap::iterator iter = windowSurfaces->begin(); iter != windowSurfaces->end(); iter++) for (WindowSurfaceMap::iterator iter = windowSurfaces->begin();
iter != windowSurfaces->end(); iter++)
{ {
if (iter->second == surface) if (iter->second == surface)
{ {
...@@ -919,7 +921,8 @@ void Display::notifyDeviceLost() ...@@ -919,7 +921,8 @@ void Display::notifyDeviceLost()
return; return;
} }
for (ContextSet::iterator context = mContextSet.begin(); context != mContextSet.end(); context++) for (ContextSet::iterator context = mContextSet.begin(); context != mContextSet.end();
context++)
{ {
(*context)->markContextLost(); (*context)->markContextLost();
} }
...@@ -1027,7 +1030,8 @@ static std::string GenerateExtensionsString(const T &extensions) ...@@ -1027,7 +1030,8 @@ static std::string GenerateExtensionsString(const T &extensions)
std::vector<std::string> extensionsVector = extensions.getStrings(); std::vector<std::string> extensionsVector = extensions.getStrings();
std::ostringstream stream; std::ostringstream stream;
std::copy(extensionsVector.begin(), extensionsVector.end(), std::ostream_iterator<std::string>(stream, " ")); std::copy(extensionsVector.begin(), extensionsVector.end(),
std::ostream_iterator<std::string>(stream, " "));
return stream.str(); return stream.str();
} }
...@@ -1115,8 +1119,7 @@ bool Display::isValidNativeDisplay(EGLNativeDisplayType display) ...@@ -1115,8 +1119,7 @@ bool Display::isValidNativeDisplay(EGLNativeDisplayType display)
} }
#if defined(ANGLE_PLATFORM_WINDOWS) && !defined(ANGLE_ENABLE_WINDOWS_STORE) #if defined(ANGLE_PLATFORM_WINDOWS) && !defined(ANGLE_ENABLE_WINDOWS_STORE)
if (display == EGL_SOFTWARE_DISPLAY_ANGLE || if (display == EGL_SOFTWARE_DISPLAY_ANGLE || display == EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE ||
display == EGL_D3D11_ELSE_D3D9_DISPLAY_ANGLE ||
display == EGL_D3D11_ONLY_DISPLAY_ANGLE) display == EGL_D3D11_ONLY_DISPLAY_ANGLE)
{ {
return true; return true;
......
src/libANGLE/Display.h
...@@ -181,7 +181,7 @@ class Display final : angle::NonCopyable ...@@ -181,7 +181,7 @@ class Display final : angle::NonCopyable
ConfigSet mConfigSet; ConfigSet mConfigSet;
typedef std::set<gl::Context*> ContextSet; typedef std::set<gl::Context *> ContextSet;
ContextSet mContextSet; ContextSet mContextSet;
typedef std::set<Image *> ImageSet; typedef std::set<Image *> ImageSet;
......
src/libANGLE/Image.cpp
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
#include "common/debug.h" #include "common/debug.h"
#include "common/utilities.h" #include "common/utilities.h"
#include "libANGLE/Renderbuffer.h"
#include "libANGLE/Texture.h"
#include "libANGLE/angletypes.h" #include "libANGLE/angletypes.h"
#include "libANGLE/formatutils.h" #include "libANGLE/formatutils.h"
#include "libANGLE/Texture.h"
#include "libANGLE/Renderbuffer.h"
#include "libANGLE/renderer/EGLImplFactory.h" #include "libANGLE/renderer/EGLImplFactory.h"
#include "libANGLE/renderer/ImageImpl.h" #include "libANGLE/renderer/ImageImpl.h"
......
src/libANGLE/Stream.cpp
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
#include "libANGLE/Stream.h" #include "libANGLE/Stream.h"
#include <platform/Platform.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include <platform/Platform.h>
#include "common/debug.h" #include "common/debug.h"
#include "common/mathutil.h" #include "common/mathutil.h"
......
src/libANGLE/Surface.cpp
...@@ -65,7 +65,8 @@ Surface::Surface(EGLint surfaceType, ...@@ -65,7 +65,8 @@ Surface::Surface(EGLint surfaceType,
mDSFormat(config->depthStencilFormat), mDSFormat(config->depthStencilFormat),
mInitState(gl::InitState::Initialized) mInitState(gl::InitState::Initialized)
{ {
mPostSubBufferRequested = (attributes.get(EGL_POST_SUB_BUFFER_SUPPORTED_NV, EGL_FALSE) == EGL_TRUE); mPostSubBufferRequested =
(attributes.get(EGL_POST_SUB_BUFFER_SUPPORTED_NV, EGL_FALSE) == EGL_TRUE);
mFlexibleSurfaceCompatibilityRequested = mFlexibleSurfaceCompatibilityRequested =
(attributes.get(EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE, EGL_FALSE) == EGL_TRUE); (attributes.get(EGL_FLEXIBLE_SURFACE_COMPATIBILITY_SUPPORTED_ANGLE, EGL_FALSE) == EGL_TRUE);
......
src/libANGLE/validationEGL.cpp
...@@ -586,8 +586,10 @@ Error ValidateStream(const Display *display, const Stream *stream) ...@@ -586,8 +586,10 @@ Error ValidateStream(const Display *display, const Stream *stream)
return NoError(); return NoError();
} }
Error ValidateCreateContext(Display *display, Config *configuration, gl::Context *shareContext, Error ValidateCreateContext(Display *display,
const AttributeMap& attributes) Config *configuration,
gl::Context *shareContext,
const AttributeMap &attributes)
{ {
ANGLE_TRY(ValidateConfig(display, configuration)); ANGLE_TRY(ValidateConfig(display, configuration));
...@@ -596,7 +598,8 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context ...@@ -596,7 +598,8 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context
EGLAttrib clientMinorVersion = 0; EGLAttrib clientMinorVersion = 0;
EGLAttrib contextFlags = 0; EGLAttrib contextFlags = 0;
bool resetNotification = false; bool resetNotification = false;
for (AttributeMap::const_iterator attributeIter = attributes.begin(); attributeIter != attributes.end(); attributeIter++) for (AttributeMap::const_iterator attributeIter = attributes.begin();
attributeIter != attributes.end(); attributeIter++)
{ {
EGLAttrib attribute = attributeIter->first; EGLAttrib attribute = attributeIter->first;
EGLAttrib value = attributeIter->second; EGLAttrib value = attributeIter->second;
...@@ -634,7 +637,8 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context ...@@ -634,7 +637,8 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context
break; break;
case EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR: case EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR:
return EglBadAttribute() << "EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR is not" return EglBadAttribute()
<< "EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_KHR is not"
<< " valid for GLES with EGL 1.4 and KHR_create_context. Use" << " valid for GLES with EGL 1.4 and KHR_create_context. Use"
<< " EXT_create_context_robustness."; << " EXT_create_context_robustness.";
case EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT: case EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT:
...@@ -672,8 +676,8 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context ...@@ -672,8 +676,8 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context
} }
if (value != EGL_TRUE && value != EGL_FALSE) if (value != EGL_TRUE && value != EGL_FALSE)
{ {
return EglBadAttribute() return EglBadAttribute() << "EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE must be "
<< "EGL_CONTEXT_WEBGL_COMPATIBILITY_ANGLE must be EGL_TRUE or EGL_FALSE."; "EGL_TRUE or EGL_FALSE.";
} }
break; break;
...@@ -700,8 +704,8 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context ...@@ -700,8 +704,8 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context
} }
if (value != EGL_TRUE && value != EGL_FALSE) if (value != EGL_TRUE && value != EGL_FALSE)
{ {
return EglBadAttribute() return EglBadAttribute() << "EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE must be "
<< "EGL_DISPLAY_TEXTURE_SHARE_GROUP_ANGLE must be EGL_TRUE or EGL_FALSE."; "EGL_TRUE or EGL_FALSE.";
} }
if (shareContext && if (shareContext &&
(shareContext->usingDisplayTextureShareGroup() != (value == EGL_TRUE))) (shareContext->usingDisplayTextureShareGroup() != (value == EGL_TRUE)))
...@@ -735,7 +739,8 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context ...@@ -735,7 +739,8 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context
} }
if (value != EGL_TRUE && value != EGL_FALSE) if (value != EGL_TRUE && value != EGL_FALSE)
{ {
return EglBadAttribute() << "EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE must " return EglBadAttribute()
<< "EGL_CONTEXT_PROGRAM_BINARY_CACHE_ENABLED_ANGLE must "
"be EGL_TRUE or EGL_FALSE."; "be EGL_TRUE or EGL_FALSE.";
} }
break; break;
...@@ -743,7 +748,8 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context ...@@ -743,7 +748,8 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context
case EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE: case EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE:
if (!display->getExtensions().robustResourceInitialization) if (!display->getExtensions().robustResourceInitialization)
{ {
return EglBadAttribute() << "Attribute EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE " return EglBadAttribute()
<< "Attribute EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE "
"requires EGL_ANGLE_robust_resource_initialization."; "requires EGL_ANGLE_robust_resource_initialization.";
} }
if (value != EGL_TRUE && value != EGL_FALSE) if (value != EGL_TRUE && value != EGL_FALSE)
...@@ -809,8 +815,8 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context ...@@ -809,8 +815,8 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context
} }
// Note: EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR does not apply to ES // Note: EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR does not apply to ES
const EGLint validContextFlags = (EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR | const EGLint validContextFlags =
EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR); (EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR | EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR);
if ((contextFlags & ~validContextFlags) != 0) if ((contextFlags & ~validContextFlags) != 0)
{ {
return EglBadAttribute(); return EglBadAttribute();
...@@ -839,8 +845,10 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context ...@@ -839,8 +845,10 @@ Error ValidateCreateContext(Display *display, Config *configuration, gl::Context
return NoError(); return NoError();
} }
Error ValidateCreateWindowSurface(Display *display, Config *config, EGLNativeWindowType window, Error ValidateCreateWindowSurface(Display *display,
const AttributeMap& attributes) Config *config,
EGLNativeWindowType window,
const AttributeMap &attributes)
{ {
ANGLE_TRY(ValidateConfig(display, config)); ANGLE_TRY(ValidateConfig(display, config));
...@@ -851,7 +859,8 @@ Error ValidateCreateWindowSurface(Display *display, Config *config, EGLNativeWin ...@@ -851,7 +859,8 @@ Error ValidateCreateWindowSurface(Display *display, Config *config, EGLNativeWin
const DisplayExtensions &displayExtensions = display->getExtensions(); const DisplayExtensions &displayExtensions = display->getExtensions();
for (AttributeMap::const_iterator attributeIter = attributes.begin(); attributeIter != attributes.end(); attributeIter++) for (AttributeMap::const_iterator attributeIter = attributes.begin();
attributeIter != attributes.end(); attributeIter++)
{ {
EGLAttrib attribute = attributeIter->first; EGLAttrib attribute = attributeIter->first;
EGLAttrib value = attributeIter->second; EGLAttrib value = attributeIter->second;
...@@ -926,7 +935,8 @@ Error ValidateCreateWindowSurface(Display *display, Config *config, EGLNativeWin ...@@ -926,7 +935,8 @@ Error ValidateCreateWindowSurface(Display *display, Config *config, EGLNativeWin
case EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE: case EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE:
if (!display->getExtensions().robustResourceInitialization) if (!display->getExtensions().robustResourceInitialization)
{ {
return EglBadAttribute() << "Attribute EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE " return EglBadAttribute()
<< "Attribute EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE "
"requires EGL_ANGLE_robust_resource_initialization."; "requires EGL_ANGLE_robust_resource_initialization.";
} }
if (value != EGL_TRUE && value != EGL_FALSE) if (value != EGL_TRUE && value != EGL_FALSE)
...@@ -949,13 +959,14 @@ Error ValidateCreateWindowSurface(Display *display, Config *config, EGLNativeWin ...@@ -949,13 +959,14 @@ Error ValidateCreateWindowSurface(Display *display, Config *config, EGLNativeWin
return NoError(); return NoError();
} }
Error ValidateCreatePbufferSurface(Display *display, Config *config, const AttributeMap& attributes) Error ValidateCreatePbufferSurface(Display *display, Config *config, const AttributeMap &attributes)
{ {
ANGLE_TRY(ValidateConfig(display, config)); ANGLE_TRY(ValidateConfig(display, config));
const DisplayExtensions &displayExtensions = display->getExtensions(); const DisplayExtensions &displayExtensions = display->getExtensions();
for (AttributeMap::const_iterator attributeIter = attributes.begin(); attributeIter != attributes.end(); attributeIter++) for (AttributeMap::const_iterator attributeIter = attributes.begin();
attributeIter != attributes.end(); attributeIter++)
{ {
EGLAttrib attribute = attributeIter->first; EGLAttrib attribute = attributeIter->first;
EGLAttrib value = attributeIter->second; EGLAttrib value = attributeIter->second;
...@@ -1017,7 +1028,8 @@ Error ValidateCreatePbufferSurface(Display *display, Config *config, const Attri ...@@ -1017,7 +1028,8 @@ Error ValidateCreatePbufferSurface(Display *display, Config *config, const Attri
case EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE: case EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE:
if (!display->getExtensions().robustResourceInitialization) if (!display->getExtensions().robustResourceInitialization)
{ {
return EglBadAttribute() << "Attribute EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE " return EglBadAttribute()
<< "Attribute EGL_ROBUST_RESOURCE_INITIALIZATION_ANGLE "
"requires EGL_ANGLE_robust_resource_initialization."; "requires EGL_ANGLE_robust_resource_initialization.";
} }
if (value != EGL_TRUE && value != EGL_FALSE) if (value != EGL_TRUE && value != EGL_FALSE)
...@@ -1056,7 +1068,8 @@ Error ValidateCreatePbufferSurface(Display *display, Config *config, const Attri ...@@ -1056,7 +1068,8 @@ Error ValidateCreatePbufferSurface(Display *display, Config *config, const Attri
EGLint width = static_cast<EGLint>(attributes.get(EGL_WIDTH, 0)); EGLint width = static_cast<EGLint>(attributes.get(EGL_WIDTH, 0));
EGLint height = static_cast<EGLint>(attributes.get(EGL_HEIGHT, 0)); EGLint height = static_cast<EGLint>(attributes.get(EGL_HEIGHT, 0));
if (textureFormat != EGL_NO_TEXTURE && !caps.textureNPOT && (!gl::isPow2(width) || !gl::isPow2(height))) if (textureFormat != EGL_NO_TEXTURE && !caps.textureNPOT &&
(!gl::isPow2(width) || !gl::isPow2(height)))
{ {
return EglBadMatch(); return EglBadMatch();
} }
...@@ -1064,8 +1077,11 @@ Error ValidateCreatePbufferSurface(Display *display, Config *config, const Attri ...@@ -1064,8 +1077,11 @@ Error ValidateCreatePbufferSurface(Display *display, Config *config, const Attri
return NoError(); return NoError();
} }
Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, EGLClientBuffer buffer, Error ValidateCreatePbufferFromClientBuffer(Display *display,
Config *config, const AttributeMap& attributes) EGLenum buftype,
EGLClientBuffer buffer,
Config *config,
const AttributeMap &attributes)
{ {
ANGLE_TRY(ValidateConfig(display, config)); ANGLE_TRY(ValidateConfig(display, config));
...@@ -1111,7 +1127,8 @@ Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, E ...@@ -1111,7 +1127,8 @@ Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, E
return EglBadParameter(); return EglBadParameter();
} }
for (AttributeMap::const_iterator attributeIter = attributes.begin(); attributeIter != attributes.end(); attributeIter++) for (AttributeMap::const_iterator attributeIter = attributes.begin();
attributeIter != attributes.end(); attributeIter++)
{ {
EGLAttrib attribute = attributeIter->first; EGLAttrib attribute = attributeIter->first;
EGLAttrib value = attributeIter->second; EGLAttrib value = attributeIter->second;
...@@ -1121,8 +1138,7 @@ Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, E ...@@ -1121,8 +1138,7 @@ Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, E
case EGL_WIDTH: case EGL_WIDTH:
case EGL_HEIGHT: case EGL_HEIGHT:
if (buftype != EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE && if (buftype != EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE &&
buftype != EGL_D3D_TEXTURE_ANGLE && buftype != EGL_D3D_TEXTURE_ANGLE && buftype != EGL_IOSURFACE_ANGLE)
buftype != EGL_IOSURFACE_ANGLE)
{ {
return EglBadParameter() return EglBadParameter()
<< "Width and Height are not supported for thie <buftype>"; << "Width and Height are not supported for thie <buftype>";
...@@ -1252,7 +1268,8 @@ Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, E ...@@ -1252,7 +1268,8 @@ Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, E
} }
const Caps &caps = display->getCaps(); const Caps &caps = display->getCaps();
if (textureFormat != EGL_NO_TEXTURE && !caps.textureNPOT && (!gl::isPow2(width) || !gl::isPow2(height))) if (textureFormat != EGL_NO_TEXTURE && !caps.textureNPOT &&
(!gl::isPow2(width) || !gl::isPow2(height)))
{ {
return EglBadMatch(); return EglBadMatch();
} }
......
src/libANGLE/validationEGL.h
...@@ -39,15 +39,24 @@ Error ValidateContext(const Display *display, const gl::Context *context); ...@@ -39,15 +39,24 @@ Error ValidateContext(const Display *display, const gl::Context *context);
Error ValidateImage(const Display *display, const Image *image); Error ValidateImage(const Display *display, const Image *image);
// Entry point validation // Entry point validation
Error ValidateCreateContext(Display *display, Config *configuration, gl::Context *shareContext, Error ValidateCreateContext(Display *display,
const AttributeMap& attributes); Config *configuration,
gl::Context *shareContext,
const AttributeMap &attributes);
Error ValidateCreateWindowSurface(Display *display, Config *config, EGLNativeWindowType window, Error ValidateCreateWindowSurface(Display *display,
const AttributeMap& attributes); Config *config,
EGLNativeWindowType window,
const AttributeMap &attributes);
Error ValidateCreatePbufferSurface(Display *display, Config *config, const AttributeMap& attributes); Error ValidateCreatePbufferSurface(Display *display,
Error ValidateCreatePbufferFromClientBuffer(Display *display, EGLenum buftype, EGLClientBuffer buffer, Config *config,
Config *config, const AttributeMap& attributes); const AttributeMap &attributes);
Error ValidateCreatePbufferFromClientBuffer(Display *display,
EGLenum buftype,
EGLClientBuffer buffer,
Config *config,
const AttributeMap &attributes);
Error ValidateMakeCurrent(Display *display, Surface *draw, Surface *read, gl::Context *context); Error ValidateMakeCurrent(Display *display, Surface *draw, Surface *read, gl::Context *context);
......
src/libEGL/libEGL.cpp
...@@ -9,35 +9,51 @@ ...@@ -9,35 +9,51 @@
#include "libGLESv2/entry_points_egl.h" #include "libGLESv2/entry_points_egl.h"
#include "libGLESv2/entry_points_egl_ext.h" #include "libGLESv2/entry_points_egl_ext.h"
extern "C" extern "C" {
{
EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config) EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy,
const EGLint *attrib_list,
EGLConfig *configs,
EGLint config_size,
EGLint *num_config)
{ {
return egl::ChooseConfig(dpy, attrib_list, configs, config_size, num_config); return egl::ChooseConfig(dpy, attrib_list, configs, config_size, num_config);
} }
EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target) EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy,
EGLSurface surface,
EGLNativePixmapType target)
{ {
return egl::CopyBuffers(dpy, surface, target); return egl::CopyBuffers(dpy, surface, target);
} }
EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list) EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy,
EGLConfig config,
EGLContext share_context,
const EGLint *attrib_list)
{ {
return egl::CreateContext(dpy, config, share_context, attrib_list); return egl::CreateContext(dpy, config, share_context, attrib_list);
} }
EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list) EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy,
EGLConfig config,
const EGLint *attrib_list)
{ {
return egl::CreatePbufferSurface(dpy, config, attrib_list); return egl::CreatePbufferSurface(dpy, config, attrib_list);
} }
EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list) EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy,
EGLConfig config,
EGLNativePixmapType pixmap,
const EGLint *attrib_list)
{ {
return egl::CreatePixmapSurface(dpy, config, pixmap, attrib_list); return egl::CreatePixmapSurface(dpy, config, pixmap, attrib_list);
} }
EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list) EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy,
EGLConfig config,
EGLNativeWindowType win,
const EGLint *attrib_list)
{ {
return egl::CreateWindowSurface(dpy, config, win, attrib_list); return egl::CreateWindowSurface(dpy, config, win, attrib_list);
} }
...@@ -52,12 +68,18 @@ EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surface) ...@@ -52,12 +68,18 @@ EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surface)
return egl::DestroySurface(dpy, surface); return egl::DestroySurface(dpy, surface);
} }
EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value) EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy,
EGLConfig config,
EGLint attribute,
EGLint *value)
{ {
return egl::GetConfigAttrib(dpy, config, attribute, value); return egl::GetConfigAttrib(dpy, config, attribute, value);
} }
EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config) EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy,
EGLConfig *configs,
EGLint config_size,
EGLint *num_config)
{ {
return egl::GetConfigs(dpy, configs, config_size, num_config); return egl::GetConfigs(dpy, configs, config_size, num_config);
} }
...@@ -87,22 +109,31 @@ EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *mino ...@@ -87,22 +109,31 @@ EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *mino
return egl::Initialize(dpy, major, minor); return egl::Initialize(dpy, major, minor);
} }
EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx) EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy,
EGLSurface draw,
EGLSurface read,
EGLContext ctx)
{ {
return egl::MakeCurrent(dpy, draw, read, ctx); return egl::MakeCurrent(dpy, draw, read, ctx);
} }
EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value) EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy,
EGLContext ctx,
EGLint attribute,
EGLint *value)
{ {
return egl::QueryContext(dpy, ctx, attribute, value); return egl::QueryContext(dpy, ctx, attribute, value);
} }
const char* EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name) const char *EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name)
{ {
return egl::QueryString(dpy, name); return egl::QueryString(dpy, name);
} }
EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value) EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy,
EGLSurface surface,
EGLint attribute,
EGLint *value)
{ {
return egl::QuerySurface(dpy, surface, attribute, value); return egl::QuerySurface(dpy, surface, attribute, value);
} }
...@@ -137,7 +168,10 @@ EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EG ...@@ -137,7 +168,10 @@ EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EG
return egl::ReleaseTexImage(dpy, surface, buffer); return egl::ReleaseTexImage(dpy, surface, buffer);
} }
EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value) EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy,
EGLSurface surface,
EGLint attribute,
EGLint value)
{ {
return egl::SurfaceAttrib(dpy, surface, attribute, value); return egl::SurfaceAttrib(dpy, surface, attribute, value);
} }
...@@ -157,7 +191,11 @@ EGLenum EGLAPIENTRY eglQueryAPI(void) ...@@ -157,7 +191,11 @@ EGLenum EGLAPIENTRY eglQueryAPI(void)
return egl::QueryAPI(); return egl::QueryAPI();
} }
EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list) EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(EGLDisplay dpy,
EGLenum buftype,
EGLClientBuffer buffer,
EGLConfig config,
const EGLint *attrib_list)
{ {
return egl::CreatePbufferFromClientBuffer(dpy, buftype, buffer, config, attrib_list); return egl::CreatePbufferFromClientBuffer(dpy, buftype, buffer, config, attrib_list);
} }
...@@ -192,12 +230,19 @@ EGLint EGLAPIENTRY eglClientWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags, ...@@ -192,12 +230,19 @@ EGLint EGLAPIENTRY eglClientWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags,
return egl::ClientWaitSync(dpy, sync, flags, timeout); return egl::ClientWaitSync(dpy, sync, flags, timeout);
} }
EGLBoolean EGLAPIENTRY eglGetSyncAttrib(EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value) EGLBoolean EGLAPIENTRY eglGetSyncAttrib(EGLDisplay dpy,
EGLSync sync,
EGLint attribute,
EGLAttrib *value)
{ {
return egl::GetSyncAttrib(dpy, sync, attribute, value); return egl::GetSyncAttrib(dpy, sync, attribute, value);
} }
EGLImage EGLAPIENTRY eglCreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list) EGLImage EGLAPIENTRY eglCreateImage(EGLDisplay dpy,
EGLContext ctx,
EGLenum target,
EGLClientBuffer buffer,
const EGLAttrib *attrib_list)
{ {
return egl::CreateImage(dpy, ctx, target, buffer, attrib_list); return egl::CreateImage(dpy, ctx, target, buffer, attrib_list);
} }
...@@ -207,17 +252,25 @@ EGLBoolean EGLAPIENTRY eglDestroyImage(EGLDisplay dpy, EGLImage image) ...@@ -207,17 +252,25 @@ EGLBoolean EGLAPIENTRY eglDestroyImage(EGLDisplay dpy, EGLImage image)
return egl::DestroyImage(dpy, image); return egl::DestroyImage(dpy, image);
} }
EGLDisplay EGLAPIENTRY eglGetPlatformDisplay(EGLenum platform, void *native_display, const EGLAttrib *attrib_list) EGLDisplay EGLAPIENTRY eglGetPlatformDisplay(EGLenum platform,
void *native_display,
const EGLAttrib *attrib_list)
{ {
return egl::GetPlatformDisplay(platform, native_display, attrib_list); return egl::GetPlatformDisplay(platform, native_display, attrib_list);
} }
EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurface(EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list) EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurface(EGLDisplay dpy,
EGLConfig config,
void *native_window,
const EGLAttrib *attrib_list)
{ {
return egl::CreatePlatformWindowSurface(dpy, config, native_window, attrib_list); return egl::CreatePlatformWindowSurface(dpy, config, native_window, attrib_list);
} }
EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurface(EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list) EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurface(EGLDisplay dpy,
EGLConfig config,
void *native_pixmap,
const EGLAttrib *attrib_list)
{ {
return egl::CreatePlatformPixmapSurface(dpy, config, native_pixmap, attrib_list); return egl::CreatePlatformPixmapSurface(dpy, config, native_pixmap, attrib_list);
} }
...@@ -227,17 +280,27 @@ EGLBoolean EGLAPIENTRY eglWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags) ...@@ -227,17 +280,27 @@ EGLBoolean EGLAPIENTRY eglWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags)
return egl::WaitSync(dpy, sync, flags); return egl::WaitSync(dpy, sync, flags);
} }
EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE(EGLDisplay dpy, EGLSurface surface, EGLint attribute, void **value) EGLBoolean EGLAPIENTRY eglQuerySurfacePointerANGLE(EGLDisplay dpy,
EGLSurface surface,
EGLint attribute,
void **value)
{ {
return egl::QuerySurfacePointerANGLE(dpy, surface, attribute, value); return egl::QuerySurfacePointerANGLE(dpy, surface, attribute, value);
} }
EGLBoolean EGLAPIENTRY eglPostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height) EGLBoolean EGLAPIENTRY eglPostSubBufferNV(EGLDisplay dpy,
EGLSurface surface,
EGLint x,
EGLint y,
EGLint width,
EGLint height)
{ {
return egl::PostSubBufferNV(dpy, surface, x, y, width, height); return egl::PostSubBufferNV(dpy, surface, x, y, width, height);
} }
EGLDisplay EGLAPIENTRY eglGetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list) EGLDisplay EGLAPIENTRY eglGetPlatformDisplayEXT(EGLenum platform,
void *native_display,
const EGLint *attrib_list)
{ {
return egl::GetPlatformDisplayEXT(platform, native_display, attrib_list); return egl::GetPlatformDisplayEXT(platform, native_display, attrib_list);
} }
...@@ -263,12 +326,14 @@ EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT(EGLDisplay dpy, EGLint attribute ...@@ -263,12 +326,14 @@ EGLBoolean EGLAPIENTRY eglQueryDisplayAttribEXT(EGLDisplay dpy, EGLint attribute
return egl::QueryDisplayAttribEXT(dpy, attribute, value); return egl::QueryDisplayAttribEXT(dpy, attribute, value);
} }
EGLBoolean EGLAPIENTRY eglQueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribute, EGLAttrib *value) EGLBoolean EGLAPIENTRY eglQueryDeviceAttribEXT(EGLDeviceEXT device,
EGLint attribute,
EGLAttrib *value)
{ {
return egl::QueryDeviceAttribEXT(device, attribute, value); return egl::QueryDeviceAttribEXT(device, attribute, value);
} }
const char * EGLAPIENTRY eglQueryDeviceStringEXT(EGLDeviceEXT device, EGLint name) const char *EGLAPIENTRY eglQueryDeviceStringEXT(EGLDeviceEXT device, EGLint name)
{ {
return egl::QueryDeviceStringEXT(device, name); return egl::QueryDeviceStringEXT(device, name);
} }
......
src/libGLESv2/entry_points_egl.h
...@@ -16,26 +16,59 @@ namespace egl ...@@ -16,26 +16,59 @@ namespace egl
{ {
// EGL 1.0 // EGL 1.0
ANGLE_EXPORT EGLBoolean EGLAPIENTRY ChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config); ANGLE_EXPORT EGLBoolean EGLAPIENTRY ChooseConfig(EGLDisplay dpy,
ANGLE_EXPORT EGLBoolean EGLAPIENTRY CopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target); const EGLint *attrib_list,
ANGLE_EXPORT EGLContext EGLAPIENTRY CreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list); EGLConfig *configs,
ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list); EGLint config_size,
ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list); EGLint *num_config);
ANGLE_EXPORT EGLSurface EGLAPIENTRY CreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType win, const EGLint *attrib_list); ANGLE_EXPORT EGLBoolean EGLAPIENTRY CopyBuffers(EGLDisplay dpy,
EGLSurface surface,
EGLNativePixmapType target);
ANGLE_EXPORT EGLContext EGLAPIENTRY CreateContext(EGLDisplay dpy,
EGLConfig config,
EGLContext share_context,
const EGLint *attrib_list);
ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePbufferSurface(EGLDisplay dpy,
EGLConfig config,
const EGLint *attrib_list);
ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePixmapSurface(EGLDisplay dpy,
EGLConfig config,
EGLNativePixmapType pixmap,
const EGLint *attrib_list);
ANGLE_EXPORT EGLSurface EGLAPIENTRY CreateWindowSurface(EGLDisplay dpy,
EGLConfig config,
EGLNativeWindowType win,
const EGLint *attrib_list);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroyContext(EGLDisplay dpy, EGLContext ctx); ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroyContext(EGLDisplay dpy, EGLContext ctx);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroySurface(EGLDisplay dpy, EGLSurface surface); ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroySurface(EGLDisplay dpy, EGLSurface surface);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY GetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value); ANGLE_EXPORT EGLBoolean EGLAPIENTRY GetConfigAttrib(EGLDisplay dpy,
ANGLE_EXPORT EGLBoolean EGLAPIENTRY GetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config); EGLConfig config,
EGLint attribute,
EGLint *value);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY GetConfigs(EGLDisplay dpy,
EGLConfig *configs,
EGLint config_size,
EGLint *num_config);
ANGLE_EXPORT EGLDisplay EGLAPIENTRY GetCurrentDisplay(void); ANGLE_EXPORT EGLDisplay EGLAPIENTRY GetCurrentDisplay(void);
ANGLE_EXPORT EGLSurface EGLAPIENTRY GetCurrentSurface(EGLint readdraw); ANGLE_EXPORT EGLSurface EGLAPIENTRY GetCurrentSurface(EGLint readdraw);
ANGLE_EXPORT EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType display_id); ANGLE_EXPORT EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType display_id);
ANGLE_EXPORT EGLint EGLAPIENTRY GetError(void); ANGLE_EXPORT EGLint EGLAPIENTRY GetError(void);
ANGLE_EXPORT __eglMustCastToProperFunctionPointerType EGLAPIENTRY GetProcAddress(const char *procname); ANGLE_EXPORT __eglMustCastToProperFunctionPointerType EGLAPIENTRY
GetProcAddress(const char *procname);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor); ANGLE_EXPORT EGLBoolean EGLAPIENTRY Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY MakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx); ANGLE_EXPORT EGLBoolean EGLAPIENTRY MakeCurrent(EGLDisplay dpy,
ANGLE_EXPORT EGLBoolean EGLAPIENTRY QueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value); EGLSurface draw,
EGLSurface read,
EGLContext ctx);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY QueryContext(EGLDisplay dpy,
EGLContext ctx,
EGLint attribute,
EGLint *value);
ANGLE_EXPORT const char *EGLAPIENTRY QueryString(EGLDisplay dpy, EGLint name); ANGLE_EXPORT const char *EGLAPIENTRY QueryString(EGLDisplay dpy, EGLint name);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY QuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value); ANGLE_EXPORT EGLBoolean EGLAPIENTRY QuerySurface(EGLDisplay dpy,
EGLSurface surface,
EGLint attribute,
EGLint *value);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY SwapBuffers(EGLDisplay dpy, EGLSurface surface); ANGLE_EXPORT EGLBoolean EGLAPIENTRY SwapBuffers(EGLDisplay dpy, EGLSurface surface);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY Terminate(EGLDisplay dpy); ANGLE_EXPORT EGLBoolean EGLAPIENTRY Terminate(EGLDisplay dpy);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY WaitGL(void); ANGLE_EXPORT EGLBoolean EGLAPIENTRY WaitGL(void);
...@@ -43,14 +76,23 @@ ANGLE_EXPORT EGLBoolean EGLAPIENTRY WaitNative(EGLint engine); ...@@ -43,14 +76,23 @@ ANGLE_EXPORT EGLBoolean EGLAPIENTRY WaitNative(EGLint engine);
// EGL 1.1 // EGL 1.1
ANGLE_EXPORT EGLBoolean EGLAPIENTRY BindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer); ANGLE_EXPORT EGLBoolean EGLAPIENTRY BindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer); ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseTexImage(EGLDisplay dpy,
ANGLE_EXPORT EGLBoolean EGLAPIENTRY SurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value); EGLSurface surface,
EGLint buffer);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY SurfaceAttrib(EGLDisplay dpy,
EGLSurface surface,
EGLint attribute,
EGLint value);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY SwapInterval(EGLDisplay dpy, EGLint interval); ANGLE_EXPORT EGLBoolean EGLAPIENTRY SwapInterval(EGLDisplay dpy, EGLint interval);
// EGL 1.2 // EGL 1.2
ANGLE_EXPORT EGLBoolean EGLAPIENTRY BindAPI(EGLenum api); ANGLE_EXPORT EGLBoolean EGLAPIENTRY BindAPI(EGLenum api);
ANGLE_EXPORT EGLenum EGLAPIENTRY QueryAPI(void); ANGLE_EXPORT EGLenum EGLAPIENTRY QueryAPI(void);
ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list); ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePbufferFromClientBuffer(EGLDisplay dpy,
EGLenum buftype,
EGLClientBuffer buffer,
EGLConfig config,
const EGLint *attrib_list);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseThread(void); ANGLE_EXPORT EGLBoolean EGLAPIENTRY ReleaseThread(void);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY WaitClient(void); ANGLE_EXPORT EGLBoolean EGLAPIENTRY WaitClient(void);
...@@ -58,17 +100,36 @@ ANGLE_EXPORT EGLBoolean EGLAPIENTRY WaitClient(void); ...@@ -58,17 +100,36 @@ ANGLE_EXPORT EGLBoolean EGLAPIENTRY WaitClient(void);
ANGLE_EXPORT EGLContext EGLAPIENTRY GetCurrentContext(void); ANGLE_EXPORT EGLContext EGLAPIENTRY GetCurrentContext(void);
// EGL 1.5 // EGL 1.5
ANGLE_EXPORT EGLSync EGLAPIENTRY CreateSync(EGLDisplay dpy, EGLenum type, const EGLAttrib *attrib_list); ANGLE_EXPORT EGLSync EGLAPIENTRY CreateSync(EGLDisplay dpy,
EGLenum type,
const EGLAttrib *attrib_list);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroySync(EGLDisplay dpy, EGLSync sync); ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroySync(EGLDisplay dpy, EGLSync sync);
ANGLE_EXPORT EGLint EGLAPIENTRY ClientWaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags, EGLTime timeout); ANGLE_EXPORT EGLint EGLAPIENTRY ClientWaitSync(EGLDisplay dpy,
ANGLE_EXPORT EGLBoolean EGLAPIENTRY GetSyncAttrib(EGLDisplay dpy, EGLSync sync, EGLint attribute, EGLAttrib *value); EGLSync sync,
ANGLE_EXPORT EGLImage EGLAPIENTRY CreateImage(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLAttrib *attrib_list); EGLint flags,
EGLTime timeout);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY GetSyncAttrib(EGLDisplay dpy,
EGLSync sync,
EGLint attribute,
EGLAttrib *value);
ANGLE_EXPORT EGLImage EGLAPIENTRY CreateImage(EGLDisplay dpy,
EGLContext ctx,
EGLenum target,
EGLClientBuffer buffer,
const EGLAttrib *attrib_list);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroyImage(EGLDisplay dpy, EGLImage image); ANGLE_EXPORT EGLBoolean EGLAPIENTRY DestroyImage(EGLDisplay dpy, EGLImage image);
ANGLE_EXPORT EGLDisplay EGLAPIENTRY GetPlatformDisplay(EGLenum platform, void *native_display, const EGLAttrib *attrib_list); ANGLE_EXPORT EGLDisplay EGLAPIENTRY GetPlatformDisplay(EGLenum platform,
ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePlatformWindowSurface(EGLDisplay dpy, EGLConfig config, void *native_window, const EGLAttrib *attrib_list); void *native_display,
ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePlatformPixmapSurface(EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLAttrib *attrib_list); const EGLAttrib *attrib_list);
ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePlatformWindowSurface(EGLDisplay dpy,
EGLConfig config,
void *native_window,
const EGLAttrib *attrib_list);
ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePlatformPixmapSurface(EGLDisplay dpy,
EGLConfig config,
void *native_pixmap,
const EGLAttrib *attrib_list);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY WaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags); ANGLE_EXPORT EGLBoolean EGLAPIENTRY WaitSync(EGLDisplay dpy, EGLSync sync, EGLint flags);
} }
#endif // LIBGLESV2_ENTRYPOINTSEGL_H_ #endif // LIBGLESV2_ENTRYPOINTSEGL_H_
src/libGLESv2/entry_points_egl_ext.cpp
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
#include "libGLESv2/global_state.h" #include "libGLESv2/global_state.h"
#include "libANGLE/Context.h" #include "libANGLE/Context.h"
#include "libANGLE/Display.h"
#include "libANGLE/Device.h" #include "libANGLE/Device.h"
#include "libANGLE/Surface.h" #include "libANGLE/Display.h"
#include "libANGLE/Stream.h" #include "libANGLE/Stream.h"
#include "libANGLE/Surface.h"
#include "libANGLE/Thread.h" #include "libANGLE/Thread.h"
#include "libANGLE/validationEGL.h" #include "libANGLE/validationEGL.h"
...@@ -23,14 +23,19 @@ namespace egl ...@@ -23,14 +23,19 @@ namespace egl
{ {
// EGL_ANGLE_query_surface_pointer // EGL_ANGLE_query_surface_pointer
EGLBoolean EGLAPIENTRY QuerySurfacePointerANGLE(EGLDisplay dpy, EGLSurface surface, EGLint attribute, void **value) EGLBoolean EGLAPIENTRY QuerySurfacePointerANGLE(EGLDisplay dpy,
EGLSurface surface,
EGLint attribute,
void **value)
{ {
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, void **value = 0x%0.8p)", EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint attribute = %d, void "
"**value = 0x%0.8p)",
dpy, surface, attribute, value); dpy, surface, attribute, value);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display*>(dpy); Display *display = static_cast<Display *>(dpy);
Surface *eglSurface = static_cast<Surface*>(surface); Surface *eglSurface = static_cast<Surface *>(surface);
Error error = ValidateSurface(display, eglSurface); Error error = ValidateSurface(display, eglSurface);
if (error.isError()) if (error.isError())
...@@ -78,11 +83,14 @@ EGLBoolean EGLAPIENTRY QuerySurfacePointerANGLE(EGLDisplay dpy, EGLSurface surfa ...@@ -78,11 +83,14 @@ EGLBoolean EGLAPIENTRY QuerySurfacePointerANGLE(EGLDisplay dpy, EGLSurface surfa
return (error.isError() ? EGL_FALSE : EGL_TRUE); return (error.isError() ? EGL_FALSE : EGL_TRUE);
} }
// EGL_NV_post_sub_buffer // EGL_NV_post_sub_buffer
EGLBoolean EGLAPIENTRY PostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height) EGLBoolean EGLAPIENTRY
PostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height)
{ {
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint x = %d, EGLint y = %d, EGLint width = %d, EGLint height = %d)", dpy, surface, x, y, width, height); EVENT(
"(EGLDisplay dpy = 0x%0.8p, EGLSurface surface = 0x%0.8p, EGLint x = %d, EGLint y = %d, "
"EGLint width = %d, EGLint height = %d)",
dpy, surface, x, y, width, height);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
if (x < 0 || y < 0 || width < 0 || height < 0) if (x < 0 || y < 0 || width < 0 || height < 0)
...@@ -91,8 +99,8 @@ EGLBoolean EGLAPIENTRY PostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLin ...@@ -91,8 +99,8 @@ EGLBoolean EGLAPIENTRY PostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLin
return EGL_FALSE; return EGL_FALSE;
} }
Display *display = static_cast<Display*>(dpy); Display *display = static_cast<Display *>(dpy);
Surface *eglSurface = static_cast<Surface*>(surface); Surface *eglSurface = static_cast<Surface *>(surface);
Error error = ValidateSurface(display, eglSurface); Error error = ValidateSurface(display, eglSurface);
if (error.isError()) if (error.isError())
...@@ -133,9 +141,13 @@ EGLBoolean EGLAPIENTRY PostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLin ...@@ -133,9 +141,13 @@ EGLBoolean EGLAPIENTRY PostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLin
} }
// EGL_EXT_platform_base // EGL_EXT_platform_base
EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list) EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform,
void *native_display,
const EGLint *attrib_list)
{ {
EVENT("(EGLenum platform = %d, void* native_display = 0x%0.8p, const EGLint* attrib_list = 0x%0.8p)", EVENT(
"(EGLenum platform = %d, void* native_display = 0x%0.8p, const EGLint* attrib_list = "
"0x%0.8p)",
platform, native_display, attrib_list); platform, native_display, attrib_list);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
...@@ -219,7 +231,7 @@ EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribut ...@@ -219,7 +231,7 @@ EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribut
device, attribute, value); device, attribute, value);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Device *dev = static_cast<Device*>(device); Device *dev = static_cast<Device *>(device);
if (dev == EGL_NO_DEVICE_EXT || !Device::IsValidDevice(dev)) if (dev == EGL_NO_DEVICE_EXT || !Device::IsValidDevice(dev))
{ {
thread->setError(EglBadAccess()); thread->setError(EglBadAccess());
...@@ -261,13 +273,12 @@ EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribut ...@@ -261,13 +273,12 @@ EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribut
} }
// EGL_EXT_device_query // EGL_EXT_device_query
const char * EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name) const char *EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name)
{ {
EVENT("(EGLDeviceEXT device = 0x%0.8p, EGLint name = %d)", EVENT("(EGLDeviceEXT device = 0x%0.8p, EGLint name = %d)", device, name);
device, name);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Device *dev = static_cast<Device*>(device); Device *dev = static_cast<Device *>(device);
if (dev == EGL_NO_DEVICE_EXT || !Device::IsValidDevice(dev)) if (dev == EGL_NO_DEVICE_EXT || !Device::IsValidDevice(dev))
{ {
thread->setError(EglBadDevice()); thread->setError(EglBadDevice());
...@@ -292,11 +303,11 @@ const char * EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name) ...@@ -292,11 +303,11 @@ const char * EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name)
// EGL_EXT_device_query // EGL_EXT_device_query
EGLBoolean EGLAPIENTRY QueryDisplayAttribEXT(EGLDisplay dpy, EGLint attribute, EGLAttrib *value) EGLBoolean EGLAPIENTRY QueryDisplayAttribEXT(EGLDisplay dpy, EGLint attribute, EGLAttrib *value)
{ {
EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint attribute = %d, EGLAttrib *value = 0x%0.8p)", EVENT("(EGLDisplay dpy = 0x%0.8p, EGLint attribute = %d, EGLAttrib *value = 0x%0.8p)", dpy,
dpy, attribute, value); attribute, value);
Thread *thread = GetCurrentThread(); Thread *thread = GetCurrentThread();
Display *display = static_cast<Display*>(dpy); Display *display = static_cast<Display *>(dpy);
Error error = ValidateDisplay(display); Error error = ValidateDisplay(display);
if (error.isError()) if (error.isError())
......
src/libGLESv2/entry_points_egl_ext.h
...@@ -17,13 +17,23 @@ namespace egl ...@@ -17,13 +17,23 @@ namespace egl
{ {
// EGL_ANGLE_query_surface_pointer // EGL_ANGLE_query_surface_pointer
ANGLE_EXPORT EGLBoolean EGLAPIENTRY QuerySurfacePointerANGLE(EGLDisplay dpy, EGLSurface surface, EGLint attribute, void **value); ANGLE_EXPORT EGLBoolean EGLAPIENTRY QuerySurfacePointerANGLE(EGLDisplay dpy,
EGLSurface surface,
EGLint attribute,
void **value);
// EGL_NV_post_sub_buffer // EGL_NV_post_sub_buffer
ANGLE_EXPORT EGLBoolean EGLAPIENTRY PostSubBufferNV(EGLDisplay dpy, EGLSurface surface, EGLint x, EGLint y, EGLint width, EGLint height); ANGLE_EXPORT EGLBoolean EGLAPIENTRY PostSubBufferNV(EGLDisplay dpy,
EGLSurface surface,
EGLint x,
EGLint y,
EGLint width,
EGLint height);
// EGL_EXT_platform_base // EGL_EXT_platform_base
ANGLE_EXPORT EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list); ANGLE_EXPORT EGLDisplay EGLAPIENTRY GetPlatformDisplayEXT(EGLenum platform,
void *native_display,
const EGLint *attrib_list);
ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePlatformWindowSurfaceEXT(EGLDisplay dpy, ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePlatformWindowSurfaceEXT(EGLDisplay dpy,
EGLConfig config, EGLConfig config,
void *native_window, void *native_window,
...@@ -34,9 +44,13 @@ ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePlatformPixmapSurfaceEXT(EGLDisplay dp ...@@ -34,9 +44,13 @@ ANGLE_EXPORT EGLSurface EGLAPIENTRY CreatePlatformPixmapSurfaceEXT(EGLDisplay dp
const EGLint *attrib_list); const EGLint *attrib_list);
// EGL_EXT_device_query // EGL_EXT_device_query
ANGLE_EXPORT EGLBoolean EGLAPIENTRY QueryDisplayAttribEXT(EGLDisplay dpy, EGLint attribute, EGLAttrib *value); ANGLE_EXPORT EGLBoolean EGLAPIENTRY QueryDisplayAttribEXT(EGLDisplay dpy,
ANGLE_EXPORT EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device, EGLint attribute, EGLAttrib *value); EGLint attribute,
ANGLE_EXPORT const char * EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name); EGLAttrib *value);
ANGLE_EXPORT EGLBoolean EGLAPIENTRY QueryDeviceAttribEXT(EGLDeviceEXT device,
EGLint attribute,
EGLAttrib *value);
ANGLE_EXPORT const char *EGLAPIENTRY QueryDeviceStringEXT(EGLDeviceEXT device, EGLint name);
// EGL_KHR_image_base/EGL_KHR_image // EGL_KHR_image_base/EGL_KHR_image
ANGLE_EXPORT EGLImageKHR EGLAPIENTRY CreateImageKHR(EGLDisplay dpy, ANGLE_EXPORT EGLImageKHR EGLAPIENTRY CreateImageKHR(EGLDisplay dpy,
......
src/tests/test_utils/ANGLETest.h
...@@ -45,8 +45,10 @@ ...@@ -45,8 +45,10 @@
#define ASSERT_EGL_ERROR(err) ASSERT_EQ((err), eglGetError()) #define ASSERT_EGL_ERROR(err) ASSERT_EQ((err), eglGetError())
#define ASSERT_EGL_SUCCESS() ASSERT_EGL_ERROR(EGL_SUCCESS) #define ASSERT_EGL_SUCCESS() ASSERT_EGL_ERROR(EGL_SUCCESS)
#define ASSERT_GLENUM_EQ(expected, actual) ASSERT_EQ(static_cast<GLenum>(expected), static_cast<GLenum>(actual)) #define ASSERT_GLENUM_EQ(expected, actual) \
#define EXPECT_GLENUM_EQ(expected, actual) EXPECT_EQ(static_cast<GLenum>(expected), static_cast<GLenum>(actual)) ASSERT_EQ(static_cast<GLenum>(expected), static_cast<GLenum>(actual))
#define EXPECT_GLENUM_EQ(expected, actual) \
EXPECT_EQ(static_cast<GLenum>(expected), static_cast<GLenum>(actual))
#define ASSERT_GLENUM_NE(expected, actual) \ #define ASSERT_GLENUM_NE(expected, actual) \
ASSERT_NE(static_cast<GLenum>(expected), static_cast<GLenum>(actual)) ASSERT_NE(static_cast<GLenum>(expected), static_cast<GLenum>(actual))
#define EXPECT_GLENUM_NE(expected, actual) \ #define EXPECT_GLENUM_NE(expected, actual) \
...@@ -168,16 +170,15 @@ GLColor32F ReadColor32F(GLint x, GLint y); ...@@ -168,16 +170,15 @@ GLColor32F ReadColor32F(GLint x, GLint y);
#define EXPECT_PIXEL_RECT_EQ(x, y, width, height, color) \ #define EXPECT_PIXEL_RECT_EQ(x, y, width, height, color) \
\ \
{ \ { \
std::vector<GLColor> actualColors(width *height); \ std::vector<GLColor> actualColors(width *height); \
glReadPixels((x), (y), (width), (height), GL_RGBA, GL_UNSIGNED_BYTE, actualColors.data()); \ glReadPixels((x), (y), (width), (height), GL_RGBA, GL_UNSIGNED_BYTE, actualColors.data()); \
std::vector<GLColor> expectedColors(width *height, color); \ std::vector<GLColor> expectedColors(width *height, color); \
EXPECT_EQ(expectedColors, actualColors); \ EXPECT_EQ(expectedColors, actualColors); \
\ }
}
#define EXPECT_PIXEL_NEAR(x, y, r, g, b, a, abs_error) \ #define EXPECT_PIXEL_NEAR(x, y, r, g, b, a, abs_error) \
{ \ { \
GLubyte pixel[4]; \ GLubyte pixel[4]; \
glReadPixels((x), (y), 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel); \ glReadPixels((x), (y), 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, pixel); \
EXPECT_GL_NO_ERROR(); \ EXPECT_GL_NO_ERROR(); \
...@@ -185,7 +186,7 @@ GLColor32F ReadColor32F(GLint x, GLint y); ...@@ -185,7 +186,7 @@ GLColor32F ReadColor32F(GLint x, GLint y);
EXPECT_NEAR((g), pixel[1], abs_error); \ EXPECT_NEAR((g), pixel[1], abs_error); \
EXPECT_NEAR((b), pixel[2], abs_error); \ EXPECT_NEAR((b), pixel[2], abs_error); \
EXPECT_NEAR((a), pixel[3], abs_error); \ EXPECT_NEAR((a), pixel[3], abs_error); \
} }
#define EXPECT_PIXEL32F_NEAR(x, y, r, g, b, a, abs_error) \ #define EXPECT_PIXEL32F_NEAR(x, y, r, g, b, a, abs_error) \
\ \
...@@ -208,13 +209,12 @@ GLColor32F ReadColor32F(GLint x, GLint y); ...@@ -208,13 +209,12 @@ GLColor32F ReadColor32F(GLint x, GLint y);
#define EXPECT_COLOR_NEAR(expected, actual, abs_error) \ #define EXPECT_COLOR_NEAR(expected, actual, abs_error) \
\ \
{ \ { \
EXPECT_NEAR(expected.R, actual.R, abs_error); \ EXPECT_NEAR(expected.R, actual.R, abs_error); \
EXPECT_NEAR(expected.G, actual.G, abs_error); \ EXPECT_NEAR(expected.G, actual.G, abs_error); \
EXPECT_NEAR(expected.B, actual.B, abs_error); \ EXPECT_NEAR(expected.B, actual.B, abs_error); \
EXPECT_NEAR(expected.A, actual.A, abs_error); \ EXPECT_NEAR(expected.A, actual.A, abs_error); \
\ }
}
#define EXPECT_PIXEL32F_NEAR(x, y, r, g, b, a, abs_error) \ #define EXPECT_PIXEL32F_NEAR(x, y, r, g, b, a, abs_error) \
\ \
{ \ { \
...@@ -453,12 +453,12 @@ bool IsRelease(); ...@@ -453,12 +453,12 @@ bool IsRelease();
// Note: git cl format messes up this formatting. // Note: git cl format messes up this formatting.
#define ANGLE_SKIP_TEST_IF(COND) \ #define ANGLE_SKIP_TEST_IF(COND) \
\ \
if(COND) \ if (COND) \
\ \
{ \ { \
std::cout << "Test skipped: " #COND "." << std::endl; \ std::cout << "Test skipped: " #COND "." << std::endl; \
return; \ return; \
\ } \
} ANGLE_EMPTY_STATEMENT ANGLE_EMPTY_STATEMENT
#endif // ANGLE_TESTS_ANGLE_TEST_H_ #endif // ANGLE_TESTS_ANGLE_TEST_H_
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