From 90f9df3210b5b66585007ec4836bfca498fd45f0 Mon Sep 17 00:00:00 2001 From: Tim Rowley Date: Fri, 4 Mar 2016 13:28:33 -0600 Subject: 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 Acked-by: Brian Paul --- src/gallium/drivers/swr/rasterizer/common/os.h | 1 - src/gallium/drivers/swr/rasterizer/core/utils.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src') diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h index 736d29856a6..522ae0dd65f 100644 --- 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 8a59ef24fee..b9dc48c4fd7 100644 --- a/src/gallium/drivers/swr/rasterizer/core/utils.h +++ b/src/gallium/drivers/swr/rasterizer/core/utils.h @@ -676,7 +676,7 @@ struct UnrollerL { 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; -- cgit v1.2.3