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
diff --git a/src/libGLESv2/Context.cpp b/src/libGLESv2/Context.cpp
index bf780d8..79fad65 100644
--- a/src/libGLESv2/Context.cpp
+++ b/src/libGLESv2/Context.cpp
@@ -2056,8 +2056,7 @@
GLint alwaysFront = !isTriangleMode(drawMode);
programBinary->setUniform1iv(pointsOrLines, 1, &alwaysFront);
- D3DADAPTER_IDENTIFIER9 *identifier = mRenderer->getAdapterIdentifier();
- bool zeroColorMaskAllowed = identifier->VendorId != 0x1002;
+ bool zeroColorMaskAllowed = mRenderer->getAdapterVendor() != VENDOR_ID_AMD;
// Apparently some ATI cards have a bug where a draw with a zero color
// write mask can cause later draws to have incorrect results. Instead,
// set a nonzero color write mask but modify the blend state so that no
@@ -3893,10 +3892,8 @@
void Context::initRendererString()
{
- D3DADAPTER_IDENTIFIER9 *identifier = mRenderer->getAdapterIdentifier();
-
mRendererString = "ANGLE (";
- mRendererString += identifier->Description;
+ mRendererString += mRenderer->getAdapterDescription();
mRendererString += ")";
}