Commit eeda03b6 by Jamie Madill Committed by Commit Bot

EGL: Remove internal enum for NULL driver.

This is now updated in Chrome, so we can remove the last uses. Bug: angleproject:2159 Change-Id: Ia31e42b8a685756ee70450be19a52248e3efa92f Reviewed-on: https://chromium-review.googlesource.com/853119Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 66e2f8f2
...@@ -199,10 +199,6 @@ std::string ToString(const T &value) ...@@ -199,10 +199,6 @@ std::string ToString(const T &value)
#define GL_UINT_64_ANGLEX 0x6ABF #define GL_UINT_64_ANGLEX 0x6ABF
#define GL_BGRA8_SRGB_ANGLEX 0x6AC0 #define GL_BGRA8_SRGB_ANGLEX 0x6AC0
// Hidden enum for the NULL D3D device type.
// TODO(jmadill): Remove this once Chrome is updated.
#define EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLEX 0x6AC0
// TODO(jmadill): Clean this up at some point. // TODO(jmadill): Clean this up at some point.
#define EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX 0x9999 #define EGL_PLATFORM_ANGLE_PLATFORM_METHODS_ANGLEX 0x9999
......
...@@ -135,12 +135,6 @@ void FunctionsGL::initialize(const egl::AttributeMap &displayAttributes) ...@@ -135,12 +135,6 @@ void FunctionsGL::initialize(const egl::AttributeMap &displayAttributes)
#if defined(ANGLE_ENABLE_OPENGL_NULL) #if defined(ANGLE_ENABLE_OPENGL_NULL)
EGLint deviceType = EGLint deviceType =
static_cast<EGLint>(displayAttributes.get(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE, EGL_NONE)); static_cast<EGLint>(displayAttributes.get(EGL_PLATFORM_ANGLE_DEVICE_TYPE_ANGLE, EGL_NONE));
// Support the old hidden enum because it is used by Chrome.
// TODO(jmadill): Remove this once Chrome is updated.
if (deviceType == EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLEX)
deviceType = EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE;
#endif // defined(ANGLE_ENABLE_GL_NULL) #endif // defined(ANGLE_ENABLE_GL_NULL)
switch (standard) switch (standard)
......
...@@ -370,10 +370,6 @@ Error ValidateGetPlatformDisplayCommon(EGLenum platform, ...@@ -370,10 +370,6 @@ Error ValidateGetPlatformDisplayCommon(EGLenum platform,
case EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE: case EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLE:
break; break;
// TODO(jmadill): Remove this once Chrome is updated.
case EGL_PLATFORM_ANGLE_DEVICE_TYPE_NULL_ANGLEX:
break;
case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE: case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_WARP_ANGLE:
case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE: case EGL_PLATFORM_ANGLE_DEVICE_TYPE_D3D_REFERENCE_ANGLE:
if (!clientExtensions.platformANGLED3D) if (!clientExtensions.platformANGLED3D)
......
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