Add adapter LUID to EGL vendor string.

src/libEGL/Display.cpp

@@ -113,6 +113,7 @@ bool Display::initialize()
     }
 
     initExtensionString();
+    initVendorString();
 
     return true;
 }
@@ -520,5 +521,24 @@ const char *Display::getExtensionString() const
     return mExtensionString.c_str();
 }
 
+void Display::initVendorString()
+{
+    mVendorString = "Google Inc.";
+
+    LUID adapterLuid = {0};
+
+    if (mRenderer && mRenderer->getLUID(&adapterLuid))
+    {
+        char adapterLuidString[64];
+        sprintf_s(adapterLuidString, sizeof(adapterLuidString), " (adapter LUID: %08x%08x)", adapterLuid.HighPart, adapterLuid.LowPart);
+
+        mVendorString += adapterLuidString;
+    }
+}
+
+const char *Display::getVendorString() const
+{
+    return mVendorString.c_str();
+}
 
 }

src/libEGL/Display.h

@@ -60,6 +60,7 @@ class Display
     virtual void recreateSwapChains();
 
     const char *getExtensionString() const;
+    const char *getVendorString() const;
 
   private:
     DISALLOW_COPY_AND_ASSIGN(Display);
@@ -84,7 +85,9 @@ class Display
     rx::Renderer *mRenderer;
 
     void initExtensionString();
+    void initVendorString();
     std::string mExtensionString;
+    std::string mVendorString;
 };
 }
 

src/libEGL/libEGL.cpp

@@ -180,9 +180,9 @@ const char *__stdcall eglQueryString(EGLDisplay dpy, EGLint name)
           case EGL_CLIENT_APIS:
             return egl::success("OpenGL_ES");
           case EGL_EXTENSIONS:
-            return display->getExtensionString();
+            return egl::success(display->getExtensionString());
           case EGL_VENDOR:
-            return egl::success("Google Inc.");
+            return egl::success(display->getVendorString());
           case EGL_VERSION:
             return egl::success("1.4 (ANGLE " VERSION_STRING ")");
         }

src/libGLESv2/renderer/Renderer.h

@@ -254,6 +254,8 @@ class Renderer
     void setCurrentClientVersion(int clientVersion) { mCurrentClientVersion = clientVersion; }
     int getCurrentClientVersion() const { return mCurrentClientVersion; }
 
+    virtual bool getLUID(LUID *adapterLuid) const = 0;
+
   protected:
     bool initializeCompiler();
     ShaderBlob *compileToBinary(gl::InfoLog &infoLog, const char *hlsl, const char *profile, UINT optimizationFlags, bool alternateFlags);

src/libGLESv2/renderer/Renderer11.cpp

@@ -4012,4 +4012,24 @@ ID3D11Texture2D *Renderer11::resolveMultisampledTexture(ID3D11Texture2D *source,
     }
 }
 
+bool Renderer11::getLUID(LUID *adapterLuid) const
+{
+    adapterLuid->HighPart = 0;
+    adapterLuid->LowPart = 0;
+
+    if (!mDxgiAdapter)
+    {
+        return false;
+    }
+
+    DXGI_ADAPTER_DESC adapterDesc;
+    if (FAILED(mDxgiAdapter->GetDesc(&adapterDesc)))
+    {
+        return false;
+    }
+
+    *adapterLuid = adapterDesc.AdapterLuid;
+    return true;
+}
+
 }

src/libGLESv2/renderer/Renderer11.h

@@ -205,6 +205,8 @@ class Renderer11 : public Renderer
     void unapplyRenderTargets();
     void setOneTimeRenderTarget(ID3D11RenderTargetView *renderTargetView);
 
+    virtual bool getLUID(LUID *adapterLuid) const;
+
   private:
     DISALLOW_COPY_AND_ASSIGN(Renderer11);
 

src/libGLESv2/renderer/Renderer9.cpp

@@ -3308,4 +3308,18 @@ TextureStorage *Renderer9::createTextureStorage2DArray(int levels, GLenum intern
     return NULL;
 }
 
+bool Renderer9::getLUID(LUID *adapterLuid) const
+{
+    adapterLuid->HighPart = 0;
+    adapterLuid->LowPart = 0;
+
+    if (mD3d9Ex)
+    {
+        mD3d9Ex->GetAdapterLUID(mAdapter, adapterLuid);
+        return true;
+    }
+
+    return false;
+}
+
 }

src/libGLESv2/renderer/Renderer9.h

@@ -215,6 +215,8 @@ class Renderer9 : public Renderer
 
     D3DPOOL getTexturePool(DWORD usage) const;
 
+    virtual bool getLUID(LUID *adapterLuid) const;
+
   private:
     DISALLOW_COPY_AND_ASSIGN(Renderer9);