commit 1f811f55df504216a4d6c5e0921110639f138ac9
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 20:57:39 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Nov 28 20:57:39 2012 +0000
tree 1b383d3b41298a294ad6d4e7e91f84382c951bfc
parent 9549bead5dc8bb07a21296ea8bea97939285c699

Silence unimplemented asserts and implement retrieving adapter information.

TRAC #22072
Signed-off-by: Daniel Koch
Author: Nicolas Capens

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1496 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/renderer/Renderer11.cpp

diff --git a/src/libGLESv2/renderer/Renderer11.cpp b/src/libGLESv2/renderer/Renderer11.cpp
index b8094a6..4665b84 100644
--- a/src/libGLESv2/renderer/Renderer11.cpp
+++ b/src/libGLESv2/renderer/Renderer11.cpp
@@ -158,6 +158,10 @@
 
     dxgiDevice->Release();
 
+    mDxgiAdapter->GetDesc(&mAdapterDescription);
+    memset(mDescription, 0, sizeof(mDescription));
+    wcstombs(mDescription, mAdapterDescription.Description, sizeof(mDescription) - 1);
+
     result = mDxgiAdapter->GetParent(__uuidof(IDXGIFactory), (void**)&mDxgiFactory);
 
     if (!mDxgiFactory || FAILED(result))
@@ -569,58 +573,54 @@
 
 DWORD Renderer11::getAdapterVendor() const
 {
-    // TODO
-    UNIMPLEMENTED();
-    return 0;
+    return mAdapterDescription.VendorId;
 }
 
 const char *Renderer11::getAdapterDescription() const
 {
-    // TODO
-    UNIMPLEMENTED();
-    return "UNIMPLEMENTED";
+    return mDescription;
 }
 
 GUID Renderer11::getAdapterIdentifier() const
 {
     // TODO
-    UNIMPLEMENTED();
-    GUID foo = {};
+    // UNIMPLEMENTED();
+    GUID foo = {0};
     return foo;
 }
 
 bool Renderer11::getDXT1TextureSupport()
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return false;
 }
 
 bool Renderer11::getDXT3TextureSupport()
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return false;
 }
 
 bool Renderer11::getDXT5TextureSupport()
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return false;
 }
 
 bool Renderer11::getDepthTextureSupport() const
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return false;
 }
 
 bool Renderer11::getFloat32TextureSupport(bool *filtering, bool *renderable)
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
 
     *filtering = false;
     *renderable = false;
@@ -630,7 +630,7 @@
 bool Renderer11::getFloat16TextureSupport(bool *filtering, bool *renderable)
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
 
     *filtering = false;
     *renderable = false;
@@ -640,70 +640,70 @@
 bool Renderer11::getLuminanceTextureSupport()
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return false;
 }
 
 bool Renderer11::getLuminanceAlphaTextureSupport()
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return false;
 }
 
 bool Renderer11::getTextureFilterAnisotropySupport() const
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return false;
 }
 
 float Renderer11::getTextureMaxAnisotropy() const
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return 1.0f;
 }
 
 bool Renderer11::getEventQuerySupport()
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return false;
 }
 
 bool Renderer11::getVertexTextureSupport() const
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return false;
 }
 
 bool Renderer11::getNonPower2TextureSupport() const
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return false;
 }
 
 bool Renderer11::getOcclusionQuerySupport() const
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return false;
 }
 
 bool Renderer11::getInstancingSupport() const
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return false;
 }
 
 bool Renderer11::getShareHandleSupport() const
 {
     // TODO
-    //UNIMPLEMENTED();
+    // UNIMPLEMENTED();
 
     // PIX doesn't seem to support using share handles, so disable them.
     return false && !gl::perfActive();
@@ -723,7 +723,7 @@
 float Renderer11::getMaxPointSize() const
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return 1.0f;
 }
 
@@ -773,7 +773,7 @@
 int Renderer11::getMaxSupportedSamples() const
 {
     // TODO
-    UNIMPLEMENTED();
+    // UNIMPLEMENTED();
     return 1;
 }