commit 4ca789e5e9f5aa460371bf47952f00e0de48cba3
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Oct 31 18:46:40 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Oct 31 18:46:40 2012 +0000
tree 7e868e47a5ddb85098ec9bf083a9c9d132e038ae
parent 024786d7ca409dbbe1877b7c60f99f50e1647e5d

Eliminated D3DADAPTER_IDENTIFIER9 uses.

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

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

src/libGLESv2/ProgramBinary.cpp

diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index b0e541e..af0d16c 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -1746,9 +1746,8 @@
     const D3DCAPS9 *binaryIdentifier = (const D3DCAPS9*) ptr;
     ptr += sizeof(GUID);
 
-    // D3D9_REPLACE
-    D3DADAPTER_IDENTIFIER9 *currentIdentifier = mRenderer->getAdapterIdentifier();
-    if (memcmp(&currentIdentifier->DeviceIdentifier, binaryIdentifier, sizeof(GUID)) != 0)
+    GUID identifier = mRenderer->getAdapterIdentifier();
+    if (memcmp(&identifier, binaryIdentifier, sizeof(GUID)) != 0)
     {
         infoLog.append("Invalid program binary.");
         return false;
@@ -1853,8 +1852,7 @@
     ASSERT(SUCCEEDED(result));
     stream.write(vertexShaderSize);
 
-    // D3D9_REPLACE
-    D3DADAPTER_IDENTIFIER9 *identifier = mRenderer->getAdapterIdentifier();
+    GUID identifier = mRenderer->getAdapterIdentifier();
 
     GLsizei streamLength = stream.length();
     const void *streamData = stream.data();
@@ -1877,7 +1875,7 @@
         memcpy(ptr, streamData, streamLength);
         ptr += streamLength;
 
-        memcpy(ptr, &identifier->DeviceIdentifier, sizeof(GUID));
+        memcpy(ptr, &identifier, sizeof(GUID));
         ptr += sizeof(GUID);
 
         result = mPixelExecutable->GetFunction(ptr, &pixelShaderSize);