Fix WinRT build break due to D3D9 histogram assumption

Change-Id: Id8e8bed76a813e5cf082659671bb6f4a112ecf24 Reviewed-on: https://chromium-review.googlesource.com/254340Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Austin Kinross <aukinros@microsoft.com> Reviewed-by: Geoff Lang <geofflang@chromium.org>

Fix WinRT build break due to D3D9 histogram assumption
bc8a1772 · Austin Kinross · Jamie Madill · 44efa0b8 · bc8a1772
Commit bc8a1772 authored Feb 26, 2015 by Austin Kinross Committed by Jamie Madill Mar 11, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 15 deletions

DisplayD3D.cpp src/libANGLE/renderer/d3d/DisplayD3D.cpp +19 -15

No files found.
--- a/src/libANGLE/renderer/d3d/DisplayD3D.cpp
+++ b/src/libANGLE/renderer/d3d/DisplayD3D.cpp
@@ -104,23 +104,27 @@ egl::Error CreateRendererD3D(egl::Display *display, RendererD3D **outRenderer)
        RendererD3D *renderer = rendererCreationFunctions[i](display);
        result = renderer->initialize();
-        if (renderer->getRendererClass() == RENDERER_D3D11)
+#       if defined(ANGLE_ENABLE_D3D11)
-        {
+            if (renderer->getRendererClass() == RENDERER_D3D11)
-            ASSERT(result.getID() >= 0 && result.getID() < NUM_D3D11_INIT_ERRORS);
+            {
+                ASSERT(result.getID() >= 0 && result.getID() < NUM_D3D11_INIT_ERRORS);
+                angle::Platform *platform = angle::Platform::current();
+                platform->histogramEnumeration("GPU.ANGLE.D3D11InitializeResult",
+                                               result.getID(), NUM_D3D11_INIT_ERRORS);
+            }
+#       endif
-            angle::Platform *platform = angle::Platform::current();
+#       if defined(ANGLE_ENABLE_D3D9)
-            platform->histogramEnumeration("GPU.ANGLE.D3D11InitializeResult",
+            if (renderer->getRendererClass() == RENDERER_D3D9)
-                                           result.getID(), NUM_D3D11_INIT_ERRORS);
+            {
-        }
+                ASSERT(result.getID() >= 0 && result.getID() < NUM_D3D9_INIT_ERRORS);
-        else
-        {
-            ASSERT(renderer->getRendererClass() == RENDERER_D3D9);
-            ASSERT(result.getID() >= 0 && result.getID() < NUM_D3D9_INIT_ERRORS);
-            angle::Platform *platform = angle::Platform::current();
+                angle::Platform *platform = angle::Platform::current();
-            platform->histogramEnumeration("GPU.ANGLE.D3D9InitializeResult",
+                platform->histogramEnumeration("GPU.ANGLE.D3D9InitializeResult",
-                                           result.getID(), NUM_D3D9_INIT_ERRORS);
+                                               result.getID(), NUM_D3D9_INIT_ERRORS);
-        }
+            }
+#       endif
        if (!result.isError())
        {