On D3D11 Feature Level 9, use IDXGIAdapter2::GetDesc2.

On Feature Level 9_3, GetDesc() returns "Software Adapter" in the hardware description string, instead of a description of the actual GPU. As a result, glGetString(GL_RENDERER) on 9_3 wouldn't return any useful info about the current hardware. Change-Id: Ie4d329a08a03ee044fc0b594308aaf0bf235c74e Reviewed-on: https://chromium-review.googlesource.com/233663Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Austin Kinross <aukinros@microsoft.com>

On D3D11 Feature Level 9, use IDXGIAdapter2::GetDesc2.
b1237ed7 · Austin Kinross · Jamie Madill · 0dbda057 · b1237ed7
Commit b1237ed7 authored Dec 08, 2014 by Austin Kinross Committed by Jamie Madill Dec 10, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 27 additions and 1 deletion

Renderer11.cpp src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp +27 -1

No files found.
--- a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
@@ -353,7 +353,33 @@ EGLint Renderer11::initialize()

    SafeRelease(dxgiDevice);

-    mDxgiAdapter->GetDesc(&mAdapterDescription);
+    IDXGIAdapter2 *dxgiAdapter2 = d3d11::DynamicCastComObject<IDXGIAdapter2>(mDxgiAdapter);
+
+    // On D3D_FEATURE_LEVEL_9_*, IDXGIAdapter::GetDesc returns "Software Adapter" for the description string.
+    // If DXGI1.2 is available then IDXGIAdapter2::GetDesc2 can be used to get the actual hardware values.
+    if (mFeatureLevel <= D3D_FEATURE_LEVEL_9_3 && dxgiAdapter2 != NULL)
+    {
+        DXGI_ADAPTER_DESC2 adapterDesc2 = {0};
+        dxgiAdapter2->GetDesc2(&adapterDesc2);
+
+        // Copy the contents of the DXGI_ADAPTER_DESC2 into mAdapterDescription (a DXGI_ADAPTER_DESC).
+        memcpy(mAdapterDescription.Description, adapterDesc2.Description, sizeof(mAdapterDescription.Description));
+        mAdapterDescription.VendorId = adapterDesc2.VendorId;
+        mAdapterDescription.DeviceId = adapterDesc2.DeviceId;
+        mAdapterDescription.SubSysId = adapterDesc2.SubSysId;
+        mAdapterDescription.Revision = adapterDesc2.Revision;
+        mAdapterDescription.DedicatedVideoMemory = adapterDesc2.DedicatedVideoMemory;
+        mAdapterDescription.DedicatedSystemMemory = adapterDesc2.DedicatedSystemMemory;
+        mAdapterDescription.SharedSystemMemory = adapterDesc2.SharedSystemMemory;
+        mAdapterDescription.AdapterLuid = adapterDesc2.AdapterLuid;
+    }
+    else
+    {
+        mDxgiAdapter->GetDesc(&mAdapterDescription);
+    }
+
+    SafeRelease(dxgiAdapter2);
+
    memset(mDescription, 0, sizeof(mDescription));
    wcstombs(mDescription, mAdapterDescription.Description, sizeof(mDescription) - 1);