Clean up Adapter LUID queries.

src/libANGLE/Display.cpp

@@ -739,15 +739,10 @@ void Display::initVendorString()
 {
     mVendorString = "Google Inc.";
 
-    LUID adapterLuid = {0};
-
-    //TODO(jmadill): LUID is not cross-platform
-    if (mRenderer && mRenderer->getLUID(&adapterLuid))
+    // TODO(jmadill): clean this up
+    if (mRenderer)
     {
-        char adapterLuidString[64];
-        sprintf_s(adapterLuidString, sizeof(adapterLuidString), " (adapter LUID: %08x%08x)", adapterLuid.HighPart, adapterLuid.LowPart);
-
-        mVendorString += adapterLuidString;
+        mVendorString += " " + mRenderer->getVendorString();
     }
 }
 

src/libANGLE/renderer/Renderer.h

@@ -152,11 +152,12 @@ class Renderer
     virtual const gl::Extensions &getRendererExtensions() const;
     const Workarounds &getWorkarounds() const;
 
+    virtual std::string getVendorString() const = 0;
+
     // TODO(jmadill): needed by egl::Display, probably should be removed
     virtual int getMajorShaderModel() const = 0;
     virtual int getMinSwapInterval() const = 0;
     virtual int getMaxSwapInterval() const = 0;
-    virtual bool getLUID(LUID *adapterLuid) const = 0;
 
   private:
     DISALLOW_COPY_AND_ASSIGN(Renderer);

src/libANGLE/renderer/d3d/RendererD3D.cpp

@@ -811,4 +811,18 @@ void RendererD3D::notifyDeviceLost()
     mDisplay->notifyDeviceLost();
 }
 
+std::string RendererD3D::getVendorString() const
+{
+    LUID adapterLuid = { 0 };
+
+    if (getLUID(&adapterLuid))
+    {
+        char adapterLuidString[64];
+        sprintf_s(adapterLuidString, sizeof(adapterLuidString), "(adapter LUID: %08x%08x)", adapterLuid.HighPart, adapterLuid.LowPart);
+        return std::string(adapterLuidString);
+    }
+
+    return std::string("");
+}
+
 }

src/libANGLE/renderer/d3d/RendererD3D.h

@@ -67,6 +67,7 @@ class RendererD3D : public Renderer
                               GLbitfield mask, GLenum filter) override;
 
     bool isDeviceLost() const override;
+    std::string getVendorString() const override;
 
     // Direct3D Specific methods
     virtual GUID getAdapterIdentifier() const = 0;
@@ -166,6 +167,8 @@ class RendererD3D : public Renderer
                                const gl::Rectangle *scissor, bool blitRenderTarget,
                                bool blitDepth, bool blitStencil, GLenum filter) = 0;
 
+    virtual bool getLUID(LUID *adapterLuid) const = 0;
+
     void cleanup();
 
     egl::Display *mDisplay;

src/libANGLE/renderer/d3d/d3d11/Renderer11.h

@@ -203,7 +203,7 @@ class Renderer11 : public RendererD3D
     void setOneTimeRenderTarget(ID3D11RenderTargetView *renderTargetView);
     gl::Error packPixels(ID3D11Texture2D *readTexture, const PackPixelsParams &params, uint8_t *pixelsOut);
 
-    virtual bool getLUID(LUID *adapterLuid) const;
+    bool getLUID(LUID *adapterLuid) const override;
     virtual VertexConversionType getVertexConversionType(const gl::VertexFormat &vertexFormat) const;
     virtual GLenum getVertexComponentType(const gl::VertexFormat &vertexFormat) const;