Fix UWP build

Bug: angleproject:4246 Change-Id: Ifcbb6fe51ee2df6baf86a308de74bab640ded834 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1982632 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Fix UWP build
d36780ba · Ethan Lee · Commit Bot · f64ddcfd · d36780ba
Commit d36780ba authored Jan 02, 2020 by Ethan Lee Committed by Commit Bot Jan 06, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 10 deletions

renderer11_utils.cpp src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp +14 -10

No files found.
--- a/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/renderer11_utils.cpp
@@ -2356,14 +2356,19 @@ void InitializeFeatures(const Renderer11DeviceCaps &deviceCaps,
                        const DXGI_ADAPTER_DESC &adapterDesc,
                        angle::FeaturesD3D *features)
 {
-    bool isNvidia                  = IsNvidia(adapterDesc.VendorId);
+    bool isNvidia          = IsNvidia(adapterDesc.VendorId);
-    bool isIntel                   = IsIntel(adapterDesc.VendorId);
+    bool isIntel           = IsIntel(adapterDesc.VendorId);
-    bool isSkylake                 = false;
+    bool isSkylake         = false;
-    bool isBroadwell               = false;
+    bool isBroadwell       = false;
-    bool isHaswell                 = false;
+    bool isHaswell         = false;
-    bool isIvyBridge               = false;
+    bool isIvyBridge       = false;
-    bool isAMD                     = IsAMD(adapterDesc.VendorId);
+    bool isAMD             = IsAMD(adapterDesc.VendorId);
-    bool isFeatureLevel9_3         = (deviceCaps.featureLevel <= D3D_FEATURE_LEVEL_9_3);
+    bool isFeatureLevel9_3 = (deviceCaps.featureLevel <= D3D_FEATURE_LEVEL_9_3);
+#if defined(ANGLE_ENABLE_WINDOWS_UWP)
+    bool isWin10 = true;
+#else
+    bool isWin10 = IsWindows10OrGreater();
+#endif
    IntelDriverVersion capsVersion = IntelDriverVersion(0);
    if (isIntel)
    {
@@ -2447,8 +2452,7 @@ void InitializeFeatures(const Renderer11DeviceCaps &deviceCaps,
    // Don't translate uniform block to StructuredBuffer on Windows 7 and earlier. This is targeted
    // to work around a bug that fails to allocate ShaderResourceView for StructuredBuffer.
-    ANGLE_FEATURE_CONDITION(features, dontTranslateUniformBlockToStructuredBuffer,
+    ANGLE_FEATURE_CONDITION(features, dontTranslateUniformBlockToStructuredBuffer, !isWin10);
-                            !IsWindows10OrGreater());
    // Call platform hooks for testing overrides.
    auto *platform = ANGLEPlatformCurrent();