diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-12-11 08:36:19 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-12-11 08:36:19 +0000 |
| commit | 3470744c837a5104a1ad431006386bc0fc136e83 (patch) | |
| tree | 412247bba40b5476dbadc4e0e1b182c9ed7d8e9c /lib/mesa/src/amd | |
| parent | 7947b53aadd0abdcc0a79df8049cca583547ed9f (diff) | |
Import Mesa 13.0.2
Diffstat (limited to 'lib/mesa/src/amd')
| -rw-r--r-- | lib/mesa/src/amd/common/amd_kernel_code_t.h | 2 | ||||
| -rw-r--r-- | lib/mesa/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.h | 1 | ||||
| -rw-r--r-- | lib/mesa/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lib/mesa/src/amd/common/amd_kernel_code_t.h b/lib/mesa/src/amd/common/amd_kernel_code_t.h index f8e950851..d0d7809da 100644 --- a/lib/mesa/src/amd/common/amd_kernel_code_t.h +++ b/lib/mesa/src/amd/common/amd_kernel_code_t.h @@ -36,7 +36,7 @@ // Gets bits for specified mask from specified src packed instance. #define AMD_HSA_BITS_GET(src, mask) \ - ((src & mask) >> mask ## _SHIFT) + ((src & mask) >> mask ## _SHIFT) \ /* Every amd_*_code_t has the following properties, which are composed of * a number of bit fields. Every bit field has a mask (AMD_CODE_PROPERTY_*), diff --git a/lib/mesa/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.h b/lib/mesa/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.h index a5652a325..cdc8c81e4 100644 --- a/lib/mesa/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.h +++ b/lib/mesa/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.h @@ -28,5 +28,6 @@ #include <amdgpu.h> void radv_amdgpu_surface_init_functions(struct radv_amdgpu_winsys *ws); +ADDR_HANDLE radv_amdgpu_addr_create(struct amdgpu_gpu_info *amdinfo, int family, int rev_id, enum chip_class chip_class); #endif /* RADV_AMDGPU_SURFACE_H */ diff --git a/lib/mesa/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h b/lib/mesa/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h index 426cf692e..abb238b35 100644 --- a/lib/mesa/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +++ b/lib/mesa/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h @@ -29,7 +29,6 @@ #define RADV_AMDGPU_WINSYS_H #include "radv_radeon_winsys.h" -#include "ac_gpu_info.h" #include "addrlib/addrinterface.h" #include <amdgpu.h> #include "util/list.h" @@ -42,8 +41,10 @@ struct radv_amdgpu_winsys { struct amdgpu_gpu_info amdinfo; ADDR_HANDLE addrlib; + uint32_t rev_id; + unsigned family; + bool debug_all_bos; - bool batchchain; pthread_mutex_t global_bo_list_lock; struct list_head global_bo_list; unsigned num_buffers; |