AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

turnip: let tu6_format_vtx* take pipe format

Browse Source 
For consistency with other tu6_format_* functions.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21117>
This commit is contained in:
Chia-I Wu
2023-02-02 17:27:58 -08:00
committed by Marge Bot
parent 41bf169a93
commit 659b2e56bd
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/freedreno/vulkan/tu_formats.c
+3 -5
View File
@@ -15,9 +15,8 @@
#include "tu_image.h"
struct tu_native_format
tu6_format_vtx(VkFormat vk_format)
tu6_format_vtx(enum pipe_format format)
{
enum pipe_format format = vk_format_to_pipe_format(vk_format);
struct tu_native_format fmt = {
.fmt = fd6_vertex_format(format),
.swap = fd6_vertex_swap(format),
@@ -27,9 +26,8 @@ tu6_format_vtx(VkFormat vk_format)
}
static bool
tu6_format_vtx_supported(VkFormat vk_format)
tu6_format_vtx_supported(enum pipe_format format)
{
enum pipe_format format = vk_format_to_pipe_format(vk_format);
return fd6_vertex_format(format) != FMT6_NONE;
}
@@ -247,7 +245,7 @@ tu_physical_device_get_format_properties(
enum pipe_format format = tu_vk_format_to_pipe_format(vk_format);
const struct util_format_description *desc = util_format_description(format);
bool supported_vtx = tu6_format_vtx_supported(vk_format);
bool supported_vtx = tu6_format_vtx_supported(format);
bool supported_color = tu6_format_color_supported(format);
bool supported_tex = tu6_format_texture_supported(format);
bool is_npot = !util_is_power_of_two_or_zero(desc->block.bits);
src/freedreno/vulkan/tu_formats.h
+1 -1
View File
@@ -20,7 +20,7 @@ struct tu_native_format
enum pipe_format tu_vk_format_to_pipe_format(VkFormat vk_format);
struct tu_native_format tu6_format_vtx(VkFormat format);
struct tu_native_format tu6_format_vtx(enum pipe_format format);
struct tu_native_format tu6_format_color(enum pipe_format format, enum a6xx_tile_mode tile_mode);
struct tu_native_format tu6_format_texture(enum pipe_format format, enum a6xx_tile_mode tile_mode);
src/freedreno/vulkan/tu_pipeline.c
+2 -1
View File
@@ -1984,7 +1984,8 @@ tu6_emit_vertex_input(struct tu_cs *cs,
const VkVertexInputAttributeDescription2EXT *attr = attrs[loc];
if (attr) {
const struct tu_native_format format = tu6_format_vtx(attr->format);
const struct tu_native_format format = tu6_format_vtx(
tu_vk_format_to_pipe_format(attr->format));
tu_cs_emit(cs, A6XX_VFD_DECODE_INSTR(0,
.idx = attr->binding,
.offset = attr->offset,