Use cross-platform enum for Vendor ID.

src/common/angleutils.h

@@ -11,12 +11,12 @@
 
 #include "common/platform.h"
 
-#include <stddef.h>
-#include <limits.h>
+#include <climits>
+#include <cstdarg>
+#include <cstddef>
 #include <string>
 #include <set>
 #include <sstream>
-#include <cstdarg>
 #include <vector>
 
 // A macro to disallow the copy constructor and operator= functions
@@ -152,10 +152,6 @@ std::string FormatString(const char *fmt, ...);
 #define snprintf _snprintf
 #endif
 
-#define VENDOR_ID_AMD 0x1002
-#define VENDOR_ID_INTEL 0x8086
-#define VENDOR_ID_NVIDIA 0x10DE
-
 #define GL_BGRA4_ANGLEX 0x6ABC
 #define GL_BGR5_A1_ANGLEX 0x6ABD
 #define GL_INT_64_ANGLEX 0x6ABE

src/libANGLE/angletypes.h

@@ -12,6 +12,8 @@
 #include "libANGLE/Constants.h"
 #include "libANGLE/RefCountObject.h"
 
+#include <cstdint>
+
 namespace gl
 {
 class Buffer;
@@ -252,6 +254,13 @@ enum VertexConversionType
     VERTEX_CONVERT_BOTH = 3
 };
 
+enum VendorID : uint32_t
+{
+    VENDOR_ID_AMD = 0x1002,
+    VENDOR_ID_INTEL = 0x8086,
+    VENDOR_ID_NVIDIA = 0x10DE,
+};
+
 }
 
 #endif // LIBANGLE_ANGLETYPES_H_

src/libANGLE/renderer/Renderer.h

@@ -143,7 +143,7 @@ class Renderer
     virtual bool testDeviceLost() = 0;
     virtual bool testDeviceResettable() = 0;
 
-    virtual DWORD getAdapterVendor() const = 0;
+    virtual VendorID getVendorId() const = 0;
     virtual std::string getRendererDescription() const = 0;
     virtual GUID getAdapterIdentifier() const = 0;
 

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

@@ -1935,9 +1935,9 @@ bool Renderer11::resetDevice()
     return true;
 }
 
-DWORD Renderer11::getAdapterVendor() const
+VendorID Renderer11::getVendorId() const
 {
-    return mAdapterDescription.VendorId;
+    return static_cast<VendorID>(mAdapterDescription.VendorId);
 }
 
 std::string Renderer11::getRendererDescription() const

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

@@ -102,7 +102,7 @@ class Renderer11 : public RendererD3D
     bool testDeviceLost() override;
     bool testDeviceResettable() override;
 
-    DWORD getAdapterVendor() const override;
+    VendorID getVendorId() const override;
     std::string getRendererDescription() const override;
     GUID getAdapterIdentifier() const override;
 

src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp

@@ -857,7 +857,7 @@ gl::Error Renderer9::setBlendState(const gl::Framebuffer *framebuffer, const gl:
         GLenum internalFormat = attachment ? attachment->getInternalFormat() : GL_NONE;
 
         // Set the color mask
-        bool zeroColorMaskAllowed = getAdapterVendor() != VENDOR_ID_AMD;
+        bool zeroColorMaskAllowed = getVendorId() != 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
@@ -2306,9 +2306,9 @@ bool Renderer9::resetRemovedDevice()
     return (initialize() == EGL_SUCCESS);
 }
 
-DWORD Renderer9::getAdapterVendor() const
+VendorID Renderer9::getVendorId() const
 {
-    return mAdapterIdentifier.VendorId;
+    return static_cast<VendorID>(mAdapterIdentifier.VendorId);
 }
 
 std::string Renderer9::getRendererDescription() const

src/libANGLE/renderer/d3d/d3d9/Renderer9.h

@@ -103,7 +103,7 @@ class Renderer9 : public RendererD3D
     bool testDeviceLost() override;
     bool testDeviceResettable() override;
 
-    DWORD getAdapterVendor() const override;
+    VendorID getVendorId() const override;
     std::string getRendererDescription() const override;
     GUID getAdapterIdentifier() const override;
 

src/libANGLE/renderer/d3d/d3d9/SwapChain9.cpp

@@ -180,7 +180,7 @@ EGLint SwapChain9::reset(int backbufferWidth, int backbufferHeight, EGLint swapI
         //
         // Some non-switchable AMD GPUs / drivers do not respect the source rectangle to Present. Therefore, when the vendor ID
         // is not Intel, the back buffer width must be exactly the same width as the window or horizontal scaling will occur.
-        if (mRenderer->getAdapterVendor() == VENDOR_ID_INTEL)
+        if (mRenderer->getVendorId() == VENDOR_ID_INTEL)
         {
             presentParameters.BackBufferWidth = (presentParameters.BackBufferWidth + 63) / 64 * 64;
         }