Commit 85f0b5ea by Jeff Gilbert Committed by Commit Bot

Allow EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE with EGL_PLATFORM_DEVICE_EXT.

Mozilla bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1395107 BUG=angleproject:2370 Change-Id: Id0c0cecbe14c1c0a1b3de18b0ccf70d00af81a80 Reviewed-on: https://chromium-review.googlesource.com/935454Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 6ae51611
...@@ -483,10 +483,10 @@ Renderer11::Renderer11(egl::Display *display) ...@@ -483,10 +483,10 @@ Renderer11::Renderer11(egl::Display *display)
ZeroMemory(&mAdapterDescription, sizeof(mAdapterDescription)); ZeroMemory(&mAdapterDescription, sizeof(mAdapterDescription));
const auto &attributes = mDisplay->getAttributeMap();
if (mDisplay->getPlatform() == EGL_PLATFORM_ANGLE_ANGLE) if (mDisplay->getPlatform() == EGL_PLATFORM_ANGLE_ANGLE)
{ {
const auto &attributes = mDisplay->getAttributeMap();
EGLint requestedMajorVersion = static_cast<EGLint>( EGLint requestedMajorVersion = static_cast<EGLint>(
attributes.get(EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, EGL_DONT_CARE)); attributes.get(EGL_PLATFORM_ANGLE_MAX_VERSION_MAJOR_ANGLE, EGL_DONT_CARE));
EGLint requestedMinorVersion = static_cast<EGLint>( EGLint requestedMinorVersion = static_cast<EGLint>(
...@@ -549,10 +549,6 @@ Renderer11::Renderer11(egl::Display *display) ...@@ -549,10 +549,6 @@ Renderer11::Renderer11(egl::Display *display)
UNREACHABLE(); UNREACHABLE();
} }
const EGLenum presentPath = static_cast<EGLenum>(attributes.get(
EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE, EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE));
mPresentPathFastEnabled = (presentPath == EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE);
mCreateDebugDevice = ShouldUseDebugLayers(attributes); mCreateDebugDevice = ShouldUseDebugLayers(attributes);
} }
else if (mDisplay->getPlatform() == EGL_PLATFORM_DEVICE_EXT) else if (mDisplay->getPlatform() == EGL_PLATFORM_DEVICE_EXT)
...@@ -563,9 +559,12 @@ Renderer11::Renderer11(egl::Display *display) ...@@ -563,9 +559,12 @@ Renderer11::Renderer11(egl::Display *display)
// Also set EGL_PLATFORM_ANGLE_ANGLE variables, in case they're used elsewhere in ANGLE // Also set EGL_PLATFORM_ANGLE_ANGLE variables, in case they're used elsewhere in ANGLE
// mAvailableFeatureLevels defaults to empty // mAvailableFeatureLevels defaults to empty
mRequestedDriverType = D3D_DRIVER_TYPE_UNKNOWN; mRequestedDriverType = D3D_DRIVER_TYPE_UNKNOWN;
mPresentPathFastEnabled = false;
} }
const EGLenum presentPath = static_cast<EGLenum>(attributes.get(
EGL_EXPERIMENTAL_PRESENT_PATH_ANGLE, EGL_EXPERIMENTAL_PRESENT_PATH_COPY_ANGLE));
mPresentPathFastEnabled = (presentPath == EGL_EXPERIMENTAL_PRESENT_PATH_FAST_ANGLE);
// The D3D11 renderer must choose the D3D9 debug annotator because the D3D11 interface // The D3D11 renderer must choose the D3D9 debug annotator because the D3D11 interface
// method ID3DUserDefinedAnnotation::GetStatus on desktop builds doesn't work with the Graphics // method ID3DUserDefinedAnnotation::GetStatus on desktop builds doesn't work with the Graphics
// Diagnostics tools in Visual Studio 2013. // Diagnostics tools in Visual Studio 2013.
......
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