Module: Mesa
Branch: master
Commit: c6f1077e0d96400c89ad577e841b1851ab9e3349
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c6f1077e0d96400c89ad577e841b1851ab9e3349
Author: Dave Airlie <airl...@redhat.com>
Date: Fri Oct 14 13:11:20 2016 +1000
radv: drop local MIN/MAX macros.
Use the ones in macros.h instead.
Acked-by: Jason Ekstrand <ja...@jlekstrand.net>
Signed-off-by: Dave Airlie <airl...@redhat.com>
---
src/amd/vulkan/radv_descriptor_set.c | 2 +-
src/amd/vulkan/radv_private.h | 5 +----
src/amd/vulkan/radv_wsi_x11.c | 2 +-
src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c | 2 +-
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/amd/vulkan/radv_descriptor_set.c
b/src/amd/vulkan/radv_descriptor_set.c
index ba8a002..3dea075 100644
--- a/src/amd/vulkan/radv_descriptor_set.c
+++ b/src/amd/vulkan/radv_descriptor_set.c
@@ -45,7 +45,7 @@ VkResult radv_CreateDescriptorSetLayout(
uint32_t max_binding = 0;
uint32_t immutable_sampler_count = 0;
for (uint32_t j = 0; j < pCreateInfo->bindingCount; j++) {
- max_binding = MAX(max_binding,
pCreateInfo->pBindings[j].binding);
+ max_binding = MAX2(max_binding,
pCreateInfo->pBindings[j].binding);
if (pCreateInfo->pBindings[j].pImmutableSamplers)
immutable_sampler_count +=
pCreateInfo->pBindings[j].descriptorCount;
}
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 1f5af62..8dddf70 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -85,9 +85,6 @@ typedef uint32_t xcb_window_t;
#define radv_noreturn __attribute__((__noreturn__))
#define radv_printflike(a, b) __attribute__((__format__(__printf__, a, b)))
-#define MIN(a, b) ((a) < (b) ? (a) : (b))
-#define MAX(a, b) ((a) > (b) ? (a) : (b))
-
static inline uint32_t
align_u32(uint32_t v, uint32_t a)
{
@@ -141,7 +138,7 @@ radv_minify(uint32_t n, uint32_t levels)
if (unlikely(n == 0))
return 0;
else
- return MAX(n >> levels, 1);
+ return MAX2(n >> levels, 1);
}
static inline float
radv_clamp_f(float f, float min, float max)
diff --git a/src/amd/vulkan/radv_wsi_x11.c b/src/amd/vulkan/radv_wsi_x11.c
index 9cd0db0..8e0040f 100644
--- a/src/amd/vulkan/radv_wsi_x11.c
+++ b/src/amd/vulkan/radv_wsi_x11.c
@@ -823,7 +823,7 @@ x11_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
* 4) One to render to
*/
if (pCreateInfo->presentMode == VK_PRESENT_MODE_MAILBOX_KHR)
- num_images = MAX(num_images, 4);
+ num_images = MAX2(num_images, 4);
size_t size = sizeof(*chain) + num_images * sizeof(chain->images[0]);
chain = radv_alloc2(&device->alloc, pAllocator, size, 8,
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c
b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c
index 31927ec..02aad3c 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_surface.c
@@ -256,7 +256,7 @@ static int radv_compute_level(ADDR_HANDLE addrlib,
surf_level->dcc_fast_clear_size =
AddrDccOut->dccFastClearSize;
surf_level->dcc_enabled = true;
surf->dcc_size = surf_level->dcc_offset +
AddrDccOut->dccRamSize;
- surf->dcc_alignment = MAX(surf->dcc_alignment,
AddrDccOut->dccRamBaseAlign);
+ surf->dcc_alignment = MAX2(surf->dcc_alignment,
AddrDccOut->dccRamBaseAlign);
}
}
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
