Mesa (master): swr/rast: add guards for cpuid on Linux

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: e7f381e9ca2b435481a86e4fb45ec13a12ce6d77
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e7f381e9ca2b435481a86e4fb45ec13a12ce6d77

Author: Alok Hota <alok.hota at intel.com>
Date:   Wed Sep 12 11:53:05 2018 -0500

swr/rast: add guards for cpuid on Linux

Reviewed-by: Bruce Cherniak <bruce.cherniak at intel.com>

---

 src/gallium/drivers/swr/rasterizer/common/isa.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gallium/drivers/swr/rasterizer/common/isa.hpp b/src/gallium/drivers/swr/rasterizer/common/isa.hpp
index aea5740bb66..41af0055f1e 100644
--- a/src/gallium/drivers/swr/rasterizer/common/isa.hpp
+++ b/src/gallium/drivers/swr/rasterizer/common/isa.hpp
@@ -38,8 +38,10 @@
 #include <intrin.h>
 #else
 #include <string.h>
+#if !defined(__cpuid)
 #include <cpuid.h>
 #endif
+#endif
 
 class InstructionSet
 {