summaryrefslogtreecommitdiffstats
path: root/src/vulkan
diff options
context:
space:
mode:
Diffstat (limited to 'src/vulkan')
-rw-r--r--src/vulkan/anv_cmd_buffer.c2
-rw-r--r--src/vulkan/anv_descriptor_set.c2
-rw-r--r--src/vulkan/anv_formats.c12
-rw-r--r--src/vulkan/anv_image.c4
-rw-r--r--src/vulkan/anv_meta.c2
-rw-r--r--src/vulkan/anv_private.h2
-rw-r--r--src/vulkan/anv_wsi_wayland.c2
7 files changed, 13 insertions, 13 deletions
diff --git a/src/vulkan/anv_cmd_buffer.c b/src/vulkan/anv_cmd_buffer.c
index a0f9bab8e1e..6b1c31f0e2e 100644
--- a/src/vulkan/anv_cmd_buffer.c
+++ b/src/vulkan/anv_cmd_buffer.c
@@ -763,7 +763,7 @@ anv_cmd_buffer_emit_binding_table(struct anv_cmd_buffer *cmd_buffer,
const struct anv_format *format =
anv_format_for_descriptor_type(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER);
anv_fill_buffer_surface_state(cmd_buffer->device, surface_state,
- format->surface_format, bo_offset, 12, 1);
+ format->isl_format, bo_offset, 12, 1);
bt_map[0] = surface_state.offset + state_offset;
add_surface_state_reloc(cmd_buffer, surface_state, bo, bo_offset);
diff --git a/src/vulkan/anv_descriptor_set.c b/src/vulkan/anv_descriptor_set.c
index 0ddd4bf1bc2..d5e6286f3ee 100644
--- a/src/vulkan/anv_descriptor_set.c
+++ b/src/vulkan/anv_descriptor_set.c
@@ -551,7 +551,7 @@ void anv_UpdateDescriptorSets(
const struct anv_format *format =
anv_format_for_descriptor_type(write->descriptorType);
- view->format = format->surface_format;
+ view->format = format->isl_format;
view->bo = buffer->bo;
view->offset = buffer->offset + write->pBufferInfo[j].offset;
diff --git a/src/vulkan/anv_formats.c b/src/vulkan/anv_formats.c
index e3c786ccca7..d96d730d378 100644
--- a/src/vulkan/anv_formats.c
+++ b/src/vulkan/anv_formats.c
@@ -33,7 +33,7 @@
[__vk_fmt] = { \
.vk_format = __vk_fmt, \
.name = #__vk_fmt, \
- .surface_format = __hw_fmt, \
+ .isl_format = __hw_fmt, \
.isl_layout = &isl_format_layouts[__hw_fmt], \
.swizzle = __swizzle, \
__VA_ARGS__ \
@@ -259,7 +259,7 @@ anv_get_isl_format(VkFormat format, VkImageAspectFlags aspect,
switch (aspect) {
case VK_IMAGE_ASPECT_COLOR_BIT:
- if (anv_fmt->surface_format == ISL_FORMAT_UNSUPPORTED) {
+ if (anv_fmt->isl_format == ISL_FORMAT_UNSUPPORTED) {
return ISL_FORMAT_UNSUPPORTED;
} else if (tiling == VK_IMAGE_TILING_OPTIMAL &&
!util_is_power_of_two(anv_fmt->isl_layout->bs)) {
@@ -268,19 +268,19 @@ anv_get_isl_format(VkFormat format, VkImageAspectFlags aspect,
* this by switching them over to RGBX or RGBA formats under the
* hood.
*/
- enum isl_format rgbx = isl_format_rgb_to_rgbx(anv_fmt->surface_format);
+ enum isl_format rgbx = isl_format_rgb_to_rgbx(anv_fmt->isl_format);
if (rgbx != ISL_FORMAT_UNSUPPORTED)
return rgbx;
else
- return isl_format_rgb_to_rgba(anv_fmt->surface_format);
+ return isl_format_rgb_to_rgba(anv_fmt->isl_format);
} else {
- return anv_fmt->surface_format;
+ return anv_fmt->isl_format;
}
case VK_IMAGE_ASPECT_DEPTH_BIT:
case (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT):
assert(anv_fmt->depth_format != 0);
- return anv_fmt->surface_format;
+ return anv_fmt->isl_format;
case VK_IMAGE_ASPECT_STENCIL_BIT:
assert(anv_fmt->has_stencil);
diff --git a/src/vulkan/anv_image.c b/src/vulkan/anv_image.c
index da71406cf27..2ed654feee2 100644
--- a/src/vulkan/anv_image.c
+++ b/src/vulkan/anv_image.c
@@ -531,7 +531,7 @@ anv_image_view_init(struct anv_image_view *iview,
iview->base_mip = range->baseMipLevel;
if (!isl_format_is_compressed(iview->format) &&
- isl_format_is_compressed(image->format->surface_format)) {
+ isl_format_is_compressed(image->format->isl_format)) {
/* Scale the ImageView extent by the backing Image. This is used
* internally when an uncompressed ImageView is created on a
* compressed Image. The ImageView can therefore be used for copying
@@ -660,7 +660,7 @@ anv_CreateBufferView(VkDevice _device,
const struct anv_format *format =
anv_format_for_vk_format(pCreateInfo->format);
- view->format = format->surface_format;
+ view->format = format->isl_format;
view->bo = buffer->bo;
view->offset = buffer->offset + pCreateInfo->offset;
view->range = pCreateInfo->range == VK_WHOLE_SIZE ?
diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c
index 72a927a08ee..2867e471a32 100644
--- a/src/vulkan/anv_meta.c
+++ b/src/vulkan/anv_meta.c
@@ -1334,7 +1334,7 @@ void anv_CmdCopyBufferToImage(
uint32_t img_x = 0;
uint32_t img_y = 0;
uint32_t img_o = 0;
- if (isl_format_is_compressed(dest_image->format->surface_format))
+ if (isl_format_is_compressed(dest_image->format->isl_format))
isl_surf_get_image_intratile_offset_el(&cmd_buffer->device->isl_dev,
&dest_image->color_surface.isl,
pRegions[r].imageSubresource.mipLevel,
diff --git a/src/vulkan/anv_private.h b/src/vulkan/anv_private.h
index d26c0b2b88d..769f81c609b 100644
--- a/src/vulkan/anv_private.h
+++ b/src/vulkan/anv_private.h
@@ -1510,7 +1510,7 @@ struct anv_format_swizzle {
struct anv_format {
const VkFormat vk_format;
const char *name;
- enum isl_format surface_format; /**< RENDER_SURFACE_STATE.SurfaceFormat */
+ enum isl_format isl_format; /**< RENDER_SURFACE_STATE.SurfaceFormat */
const struct isl_format_layout *isl_layout;
uint16_t depth_format; /**< 3DSTATE_DEPTH_BUFFER.SurfaceFormat */
struct anv_format_swizzle swizzle;
diff --git a/src/vulkan/anv_wsi_wayland.c b/src/vulkan/anv_wsi_wayland.c
index 31d5f836a9f..4ae594b10d4 100644
--- a/src/vulkan/anv_wsi_wayland.c
+++ b/src/vulkan/anv_wsi_wayland.c
@@ -60,7 +60,7 @@ wsi_wl_display_add_vk_format(struct wsi_wl_display *display, VkFormat format)
return;
/* Don't add formats which aren't supported by the driver */
- if (anv_format_for_vk_format(format)->surface_format ==
+ if (anv_format_for_vk_format(format)->isl_format ==
ISL_FORMAT_UNSUPPORTED) {
return;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 22:44:01 +0000