diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-08-27 21:39:16 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-09-12 19:42:57 -0700 |
| commit | 7ddb21708c800dfbe3cea2df6aaaf7aed852761b (patch) | |
| tree | d6572da54873cc2f06aeef659aecaa1a868e89ab /src/intel/vulkan/anv_image.c | |
| parent | 376d1dc2f1f5a36fe20ede5defe394b87b385731 (diff) | |
| download | external_mesa3d-7ddb21708c800dfbe3cea2df6aaaf7aed852761b.tar.gz external_mesa3d-7ddb21708c800dfbe3cea2df6aaaf7aed852761b.tar.bz2 external_mesa3d-7ddb21708c800dfbe3cea2df6aaaf7aed852761b.zip | |
intel/isl: Add an isl_swizzle structure and use it for isl_view swizzles
This should be more compact than the enum isl_channel_select[4] that we
were using before. It's also very convenient because we already had such a
structure in the Vulkan driver we just needed to pull it over.
Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Diffstat (limited to 'src/intel/vulkan/anv_image.c')
| -rw-r--r-- | src/intel/vulkan/anv_image.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/intel/vulkan/anv_image.c b/src/intel/vulkan/anv_image.c index af6b4ca851..63b8c86f5c 100644 --- a/src/intel/vulkan/anv_image.c +++ b/src/intel/vulkan/anv_image.c @@ -345,7 +345,7 @@ alloc_surface_state(struct anv_device *device, static enum isl_channel_select remap_swizzle(VkComponentSwizzle swizzle, VkComponentSwizzle component, - struct anv_format_swizzle format_swizzle) + struct isl_swizzle format_swizzle) { if (swizzle == VK_COMPONENT_SWIZZLE_IDENTITY) swizzle = component; @@ -414,15 +414,15 @@ anv_image_view_init(struct anv_image_view *iview, .levels = anv_get_levelCount(image, range), .base_array_layer = range->baseArrayLayer, .array_len = anv_get_layerCount(image, range), - .channel_select = { - remap_swizzle(pCreateInfo->components.r, - VK_COMPONENT_SWIZZLE_R, format.swizzle), - remap_swizzle(pCreateInfo->components.g, - VK_COMPONENT_SWIZZLE_G, format.swizzle), - remap_swizzle(pCreateInfo->components.b, - VK_COMPONENT_SWIZZLE_B, format.swizzle), - remap_swizzle(pCreateInfo->components.a, - VK_COMPONENT_SWIZZLE_A, format.swizzle), + .swizzle = { + .r = remap_swizzle(pCreateInfo->components.r, + VK_COMPONENT_SWIZZLE_R, format.swizzle), + .g = remap_swizzle(pCreateInfo->components.g, + VK_COMPONENT_SWIZZLE_G, format.swizzle), + .b = remap_swizzle(pCreateInfo->components.b, + VK_COMPONENT_SWIZZLE_B, format.swizzle), + .a = remap_swizzle(pCreateInfo->components.a, + VK_COMPONENT_SWIZZLE_A, format.swizzle), }, }; |