OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: Wrap pragmas with __GNUC__ to fix MSVC

Browse Source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7866>
This commit is contained in:
James Park
2020-11-26 18:57:47 -08:00
committed by Marge Bot
parent c4a516ca70
commit fe67fe688a
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/amd/vulkan/radv_debug.c
View File

@@ -860,10 +860,14 @@ radv_get_faulty_shader(struct radv_device *device, uint64_t faulty_pc)
mtx_lock(&device->shader_slab_mutex); mtx_lock(&device->shader_slab_mutex);
list_for_each_entry(struct radv_shader_slab, slab, &device->shader_slabs, slabs) { list_for_each_entry(struct radv_shader_slab, slab, &device->shader_slabs, slabs) {
#ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow" #pragma GCC diagnostic ignored "-Wshadow"
#endif
list_for_each_entry(struct radv_shader_variant, s, &slab->shaders, slab_list) { list_for_each_entry(struct radv_shader_variant, s, &slab->shaders, slab_list) {
#ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif
uint64_t offset = align_u64(s->bo_offset + s->code_size, 256); uint64_t offset = align_u64(s->bo_offset + s->code_size, 256);
uint64_t va = radv_buffer_get_va(s->bo); uint64_t va = radv_buffer_get_va(s->bo);

4
src/amd/vulkan/radv_shader.c
View File

@@ -762,10 +762,14 @@ radv_alloc_shader_memory(struct radv_device *device,
list_for_each_entry(struct radv_shader_slab, slab, &device->shader_slabs, slabs) { list_for_each_entry(struct radv_shader_slab, slab, &device->shader_slabs, slabs) {
uint64_t offset = 0; uint64_t offset = 0;
#ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow" #pragma GCC diagnostic ignored "-Wshadow"
#endif
list_for_each_entry(struct radv_shader_variant, s, &slab->shaders, slab_list) { list_for_each_entry(struct radv_shader_variant, s, &slab->shaders, slab_list) {
#ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif
if (s->bo_offset - offset >= shader->code_size) { if (s->bo_offset - offset >= shader->code_size) {
shader->bo = slab->bo; shader->bo = slab->bo;
shader->bo_offset = offset; shader->bo_offset = offset;

4
src/amd/vulkan/vk_format.h
View File

@@ -149,10 +149,14 @@ struct vk_format_description
extern const struct vk_format_description vk_format_description_table[]; extern const struct vk_format_description vk_format_description_table[];
/* Silence warnings triggered by sharing function/struct names */ /* Silence warnings triggered by sharing function/struct names */
#ifdef __GNUC__
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow" #pragma GCC diagnostic ignored "-Wshadow"
#endif
const struct vk_format_description *vk_format_description(VkFormat format); const struct vk_format_description *vk_format_description(VkFormat format);
#ifdef __GNUC__
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif
/** /**
* Return total bits needed for the pixel format per block. * Return total bits needed for the pixel format per block.