diff options
| author | Jason Ekstrand <[email protected]> | 2015-10-06 10:07:47 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-10-06 10:07:47 -0700 |
| commit | bd4cde708a2ad0bea04eb318d7c54447ccbbc7af (patch) | |
| tree | d096dd51da5697570de93f72dbd9c4f228f730ff | |
| parent | 81c7fa877274b5767657497699f1d46981784fc9 (diff) | |
vk/0.170.2: Rename fields in VkClearColorValue
| -rw-r--r-- | include/vulkan/vulkan.h | 6 | ||||
| -rw-r--r-- | src/vulkan/anv_device.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index cec176f3bf9..2c448b54f38 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -1982,9 +1982,9 @@ typedef struct { } VkBufferImageCopy; typedef union { - float f32[4]; - int32_t s32[4]; - uint32_t u32[4]; + float float32[4]; + int32_t int32[4]; + uint32_t uint32[4]; } VkClearColorValue; typedef struct { diff --git a/src/vulkan/anv_device.c b/src/vulkan/anv_device.c index 3ab91726024..a956c3cdf44 100644 --- a/src/vulkan/anv_device.c +++ b/src/vulkan/anv_device.c @@ -547,12 +547,12 @@ static void anv_device_init_border_colors(struct anv_device *device) { static const VkClearColorValue border_colors[] = { - [VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK] = { .f32 = { 0.0, 0.0, 0.0, 0.0 } }, - [VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK] = { .f32 = { 0.0, 0.0, 0.0, 1.0 } }, - [VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE] = { .f32 = { 1.0, 1.0, 1.0, 1.0 } }, - [VK_BORDER_COLOR_INT_TRANSPARENT_BLACK] = { .u32 = { 0, 0, 0, 0 } }, - [VK_BORDER_COLOR_INT_OPAQUE_BLACK] = { .u32 = { 0, 0, 0, 1 } }, - [VK_BORDER_COLOR_INT_OPAQUE_WHITE] = { .u32 = { 1, 1, 1, 1 } }, + [VK_BORDER_COLOR_FLOAT_TRANSPARENT_BLACK] = { .float32 = { 0.0, 0.0, 0.0, 0.0 } }, + [VK_BORDER_COLOR_FLOAT_OPAQUE_BLACK] = { .float32 = { 0.0, 0.0, 0.0, 1.0 } }, + [VK_BORDER_COLOR_FLOAT_OPAQUE_WHITE] = { .float32 = { 1.0, 1.0, 1.0, 1.0 } }, + [VK_BORDER_COLOR_INT_TRANSPARENT_BLACK] = { .uint32 = { 0, 0, 0, 0 } }, + [VK_BORDER_COLOR_INT_OPAQUE_BLACK] = { .uint32 = { 0, 0, 0, 1 } }, + [VK_BORDER_COLOR_INT_OPAQUE_WHITE] = { .uint32 = { 1, 1, 1, 1 } }, }; device->border_colors = |