diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-05-23 04:41:36 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2019-05-23 04:41:36 +0000 |
| commit | e05714d904d2b1623360a5cedbb3093a54e3aff7 (patch) | |
| tree | 2a0e68ad7929299c92e1a8c07e6512a64c3ec0df /lib | |
| parent | 4c16d468860fdf47483a01992a8c7824e89c559e (diff) | |
Import Mesa 19.0.5
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mesa/src/amd/addrlib/src/chip/gfx9/gfx9_gb_reg.h | 29 | ||||
| -rw-r--r-- | lib/mesa/src/amd/addrlib/src/chip/r800/si_gb_reg.h | 30 |
2 files changed, 28 insertions, 31 deletions
diff --git a/lib/mesa/src/amd/addrlib/src/chip/gfx9/gfx9_gb_reg.h b/lib/mesa/src/amd/addrlib/src/chip/gfx9/gfx9_gb_reg.h index ee49bd883..ade70b9f6 100644 --- a/lib/mesa/src/amd/addrlib/src/chip/gfx9/gfx9_gb_reg.h +++ b/lib/mesa/src/amd/addrlib/src/chip/gfx9/gfx9_gb_reg.h @@ -1,5 +1,8 @@ +#if !defined (__GFX9_GB_REG_H__) +#define __GFX9_GB_REG_H__ + /* - * Copyright © 2007-2019 Advanced Micro Devices, Inc. + * Copyright © 2007-2018 Advanced Micro Devices, Inc. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -24,25 +27,21 @@ * of the Software. */ -#if !defined (__GFX9_GB_REG_H__) -#define __GFX9_GB_REG_H__ +#include "util/u_endian.h" -/* -* gfx9_gb_reg.h -* -* Register Spec Release: 1.0 -* -*/ +#if defined(PIPE_ARCH_LITTLE_ENDIAN) +#define LITTLEENDIAN_CPU +#elif defined(PIPE_ARCH_BIG_ENDIAN) +#define BIGENDIAN_CPU +#endif // // Make sure the necessary endian defines are there. // -#include "util/u_endian.h" - -#if UTIL_ARCH_LITTLE_ENDIAN -#define LITTLEENDIAN_CPU -#elif UTIL_ARCH_BIG_ENDIAN -#define BIGENDIAN_CPU +#if defined(LITTLEENDIAN_CPU) +#elif defined(BIGENDIAN_CPU) +#else +#error "BIGENDIAN_CPU or LITTLEENDIAN_CPU must be defined" #endif union GB_ADDR_CONFIG { diff --git a/lib/mesa/src/amd/addrlib/src/chip/r800/si_gb_reg.h b/lib/mesa/src/amd/addrlib/src/chip/r800/si_gb_reg.h index e5af4fd2b..15711ee4b 100644 --- a/lib/mesa/src/amd/addrlib/src/chip/r800/si_gb_reg.h +++ b/lib/mesa/src/amd/addrlib/src/chip/r800/si_gb_reg.h @@ -1,5 +1,8 @@ +#if !defined (__SI_GB_REG_H__) +#define __SI_GB_REG_H__ + /* - * Copyright © 2007-2019 Advanced Micro Devices, Inc. + * Copyright © 2007-2018 Advanced Micro Devices, Inc. * All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining @@ -24,26 +27,21 @@ * of the Software. */ -#if !defined (__SI_GB_REG_H__) -#define __SI_GB_REG_H__ +#include "util/u_endian.h" -/***************************************************************************************************************** - * - * si_gb_reg.h - * - * Register Spec Release: Chip Spec 0.28 - * - *****************************************************************************************************************/ +#if defined(PIPE_ARCH_LITTLE_ENDIAN) +#define LITTLEENDIAN_CPU +#elif defined(PIPE_ARCH_BIG_ENDIAN) +#define BIGENDIAN_CPU +#endif // // Make sure the necessary endian defines are there. // -#include "util/u_endian.h" - -#if UTIL_ARCH_LITTLE_ENDIAN -#define LITTLEENDIAN_CPU -#elif UTIL_ARCH_BIG_ENDIAN -#define BIGENDIAN_CPU +#if defined(LITTLEENDIAN_CPU) +#elif defined(BIGENDIAN_CPU) +#else +#error "BIGENDIAN_CPU or LITTLEENDIAN_CPU must be defined" #endif /* |