fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 19:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvk: Implement VK_EXT_border_color_swizzle

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
This commit is contained in:
Faith Ekstrand 2023-01-30 20:12:01 -06:00 • committed by Marge Bot
parent 39958c9e9d
commit 07f6947981
2 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/nouveau/vulkan/nvk_physical_device.c
View file

@ -102,6 +102,12 @@ nvk_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice,
f->formatA4B4G4R4 = true;
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT: {
VkPhysicalDeviceBorderColorSwizzleFeaturesEXT *f = (void *)ext;
f->borderColorSwizzle = true;
f->borderColorSwizzleFromImage = false;
break;
}
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT: {
VkPhysicalDeviceCustomBorderColorFeaturesEXT *f = (void *)ext;
f->customBorderColors = true;
@ -316,6 +322,7 @@ nvk_get_device_extensions(const struct nvk_physical_device *device,
.KHR_swapchain_mutable_format = true,
#endif
.KHR_variable_pointers = true,
.EXT_border_color_swizzle = true,
.EXT_custom_border_color = true,
.EXT_inline_uniform_block = true,
.EXT_extended_dynamic_state = true,

32
src/nouveau/vulkan/nvk_sampler.c
View file

@ -4,8 +4,10 @@
#include "nouveau_context.h"
#include "util/bitpack_helpers.h"
#include "util/format/format_utils.h"
#include "util/format_srgb.h"
#include "vulkan/runtime/vk_sampler.h"
#include "vk_format.h"
#include "vk_sampler.h"
#include "cla097.h"
#include "clb197.h"
@ -256,11 +258,31 @@ nvk_CreateSampler(VkDevice _device,
SAMP_SET_UF(samp, NV9097, 2, MIN_LOD_CLAMP, pCreateInfo->minLod);
SAMP_SET_UF(samp, NV9097, 2, MAX_LOD_CLAMP, pCreateInfo->maxLod);
const VkClearColorValue bc =
vk_sampler_border_color_value(pCreateInfo, NULL);
VkClearColorValue bc = vk_sampler_border_color_value(pCreateInfo, NULL);
uint8_t bc_srgb[3];
for (unsigned i = 0; i < 3; i++)
bc_srgb[i] = util_format_linear_float_to_srgb_8unorm(bc.float32[i]);
const VkSamplerBorderColorComponentMappingCreateInfoEXT *swiz_info =
vk_find_struct_const(pCreateInfo->pNext,
SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT);
if (swiz_info) {
if (swiz_info->srgb) {
for (uint32_t i = 0; i < 3; i++)
bc.float32[i] = util_format_linear_to_srgb_float(bc.float32[i]);
}
const bool is_int = vk_border_color_is_int(pCreateInfo->borderColor);
bc = vk_swizzle_color_value(bc, swiz_info->components, is_int);
for (uint32_t i = 0; i < 3; i++)
bc_srgb[i] = _mesa_float_to_unorm(bc.float32[i], 8);
} else {
/* Otherwise, we can assume no swizzle or that the border color is
* transparent black or opaque white and there's nothing to do but
* convert the (unswizzled) border color to sRGB.
*/
for (unsigned i = 0; i < 3; i++)
bc_srgb[i] = util_format_linear_float_to_srgb_8unorm(bc.float32[i]);
}
SAMP_SET_U(samp, NV9097, 2, S_R_G_B_BORDER_COLOR_R, bc_srgb[0]);
SAMP_SET_U(samp, NV9097, 3, S_R_G_B_BORDER_COLOR_G, bc_srgb[1]);