diff options
| author | Tim Rowley <[email protected]> | 2016-03-04 13:28:33 -0600 |
|---|---|---|
| committer | Tim Rowley <[email protected]> | 2016-03-07 17:22:24 -0600 |
| commit | 90f9df3210b5b66585007ec4836bfca498fd45f0 (patch) | |
| tree | 3670aa6e56c4b10a82d53448db0ac7ad72331d24 | |
| parent | 035d39b539473e81b5a4f637a5d644bd2031279d (diff) | |
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 <[email protected]>
Acked-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/common/os.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/swr/rasterizer/core/utils.h | 2 |
2 files changed, 1 insertions, 2 deletions
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<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; |