gallium/swr: fix issues preventing a 32-bit build

Not a currently tested configuration, but these couple of small changes
allow a 32-bit build.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94383
Acked-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Brian Paul <brianp@vmware.com>

diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h
index 736d29856a6128f2eeab7940d32f39d6d1704424..522ae0dd65f3e1d0ddcb8a68189dc49e32382e26 100644 (file)
--- a/src/gallium/drivers/swr/rasterizer/common/os.h
+++ b/src/gallium/drivers/swr/rasterizer/common/os.h
@@ -81,7 +81,6 @@ typedef CARD8                 BOOL;
 typedef wchar_t                        WCHAR;
 typedef uint16_t               UINT16;
 typedef int                            INT;
-typedef int             INT32;
 typedef unsigned int   UINT;
 typedef uint32_t               UINT32;
 typedef uint64_t               UINT64;

diff --git a/src/gallium/drivers/swr/rasterizer/core/utils.h b/src/gallium/drivers/swr/rasterizer/core/utils.h
index 8a59ef24feed8dbbee06c12eb8504bdfaffb3a88..b9dc48c4fd7898aa4e6bad33a59e56be296afb1a 100644 (file)
--- a/src/gallium/drivers/swr/rasterizer/core/utils.h
+++ b/src/gallium/drivers/swr/rasterizer/core/utils.h
@@ -676,7 +676,7 @@ struct UnrollerL<End, End, Step> {
 INLINE
 uint32_t ComputeCRC(uint32_t crc, const void *pData, uint32_t size)
 {
-#if defined(_WIN64) || defined(__linux__) || defined(__gnu_linux__)
+#if defined(_WIN64) || defined(__x86_64__)
     uint32_t sizeInQwords = size / sizeof(uint64_t);
     uint32_t sizeRemainderBytes = size % sizeof(uint64_t);
     uint64_t* pDataWords = (uint64_t*)pData;