Module: Mesa Branch: main Commit: a41d65cfba333177ddf3f8a3758624bc121959a6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a41d65cfba333177ddf3f8a3758624bc121959a6
Author: Faith Ekstrand <faith.ekstr...@collabora.com> Date: Mon Aug 21 17:48:12 2023 -0500 dxil: Use mesa_prim consistently Reviewed-by: Alyssa Rosenzweig <aly...@rosenzweig.io> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24821> --- src/microsoft/compiler/dxil_enums.c | 4 ++-- src/microsoft/compiler/dxil_enums.h | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/microsoft/compiler/dxil_enums.c b/src/microsoft/compiler/dxil_enums.c index bb13edfe639..473f0820141 100644 --- a/src/microsoft/compiler/dxil_enums.c +++ b/src/microsoft/compiler/dxil_enums.c @@ -122,7 +122,7 @@ enum dxil_resource_kind dxil_get_resource_kind(const struct glsl_type *type) unreachable("unexpected glsl type"); } -enum dxil_input_primitive dxil_get_input_primitive(unsigned primitive) +enum dxil_input_primitive dxil_get_input_primitive(enum mesa_prim primitive) { switch (primitive) { case MESA_PRIM_POINTS: @@ -140,7 +140,7 @@ enum dxil_input_primitive dxil_get_input_primitive(unsigned primitive) } } -enum dxil_primitive_topology dxil_get_primitive_topology(unsigned topology) +enum dxil_primitive_topology dxil_get_primitive_topology(enum mesa_prim topology) { switch (topology) { case MESA_PRIM_POINTS: diff --git a/src/microsoft/compiler/dxil_enums.h b/src/microsoft/compiler/dxil_enums.h index 8c88d341eb1..9f961e803b7 100644 --- a/src/microsoft/compiler/dxil_enums.h +++ b/src/microsoft/compiler/dxil_enums.h @@ -26,6 +26,8 @@ #include <stdbool.h> +#include "shader_enums.h" + enum dxil_signature_kind { DXIL_SIG_INVALID = 0, DXIL_SIG_INPUT, @@ -383,9 +385,9 @@ enum dxil_prog_sig_comp_type dxil_get_prog_sig_comp_type(const struct glsl_type enum dxil_resource_kind dxil_sampler_dim_to_resource_kind(enum glsl_sampler_dim dim, bool is_array); enum dxil_resource_kind dxil_get_resource_kind(const struct glsl_type *type); -enum dxil_primitive_topology dxil_get_primitive_topology(unsigned topology); +enum dxil_primitive_topology dxil_get_primitive_topology(enum mesa_prim topology); -enum dxil_input_primitive dxil_get_input_primitive(unsigned primitive); +enum dxil_input_primitive dxil_get_input_primitive(enum mesa_prim primitive); const char *dxil_overload_suffix( enum overload_type overload);
