gallium: fixup some inconsistent uses of enum pipe_shader_type.

These should be the enum not unsigned.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com> (panfrost)
Reviewed-by: Juan A. Suarez Romero <jasuarez@igalia.com> (v3d)
Reviewed-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17747>
This commit is contained in:
Dave Airlie 2022-07-26 14:10:30 +10:00 committed by Marge Bot
parent 49253c9c1b
commit 9edd861eb1
10 changed files with 16 additions and 16 deletions

View file

@ -634,7 +634,7 @@ static void noop_set_max_shader_compiler_threads(struct pipe_screen *screen,
static bool noop_is_parallel_shader_compilation_finished(struct pipe_screen *screen,
void *shader,
unsigned shader_type)
enum pipe_shader_type shader_type)
{
return true;
}

View file

@ -954,7 +954,7 @@ etna_screen_bo_from_handle(struct pipe_screen *pscreen,
static const void *
etna_get_compiler_options(struct pipe_screen *pscreen,
enum pipe_shader_ir ir, unsigned shader)
enum pipe_shader_ir ir, enum pipe_shader_type shader)
{
return etna_compiler_get_options(etna_screen(pscreen)->compiler);
}

View file

@ -803,7 +803,7 @@ fd_get_compute_param(struct pipe_screen *pscreen, enum pipe_shader_ir ir_type,
static const void *
fd_get_compiler_options(struct pipe_screen *pscreen, enum pipe_shader_ir ir,
unsigned shader)
enum pipe_shader_type shader)
{
struct fd_screen *screen = fd_screen(pscreen);

View file

@ -221,7 +221,7 @@ panfrost_batch_write_rsrc(struct panfrost_batch *batch,
struct panfrost_bo *
panfrost_batch_create_bo(struct panfrost_batch *batch, size_t size,
uint32_t create_flags, uint32_t access_flags,
uint32_t create_flags, enum pipe_shader_type stage,
const char *label);
void

View file

@ -210,7 +210,7 @@ tegra_create_sampler_state(struct pipe_context *pcontext,
}
static void
tegra_bind_sampler_states(struct pipe_context *pcontext, unsigned shader,
tegra_bind_sampler_states(struct pipe_context *pcontext, enum pipe_shader_type shader,
unsigned start_slot, unsigned num_samplers,
void **samplers)
{
@ -475,7 +475,7 @@ tegra_set_clip_state(struct pipe_context *pcontext,
}
static void
tegra_set_constant_buffer(struct pipe_context *pcontext, unsigned int shader,
tegra_set_constant_buffer(struct pipe_context *pcontext, enum pipe_shader_type shader,
unsigned int index, bool take_ownership,
const struct pipe_constant_buffer *buf)
{
@ -559,7 +559,7 @@ tegra_set_viewport_states(struct pipe_context *pcontext, unsigned start_slot,
}
static void
tegra_set_sampler_views(struct pipe_context *pcontext, unsigned shader,
tegra_set_sampler_views(struct pipe_context *pcontext, enum pipe_shader_type shader,
unsigned start_slot, unsigned num_views,
unsigned unbind_num_trailing_slots,
bool take_ownership,
@ -610,7 +610,7 @@ tegra_set_debug_callback(struct pipe_context *pcontext,
}
static void
tegra_set_shader_buffers(struct pipe_context *pcontext, unsigned int shader,
tegra_set_shader_buffers(struct pipe_context *pcontext, enum pipe_shader_type shader,
unsigned start, unsigned count,
const struct pipe_shader_buffer *buffers,
unsigned writable_bitmask)
@ -622,7 +622,7 @@ tegra_set_shader_buffers(struct pipe_context *pcontext, unsigned int shader,
}
static void
tegra_set_shader_images(struct pipe_context *pcontext, unsigned int shader,
tegra_set_shader_images(struct pipe_context *pcontext, enum pipe_shader_type shader,
unsigned start, unsigned count,
unsigned unbind_num_trailing_slots,
const struct pipe_image_view *images)

View file

@ -89,7 +89,7 @@ tegra_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
}
static int
tegra_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader,
tegra_screen_get_shader_param(struct pipe_screen *pscreen, enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct tegra_screen *screen = to_tegra_screen(pscreen);
@ -445,7 +445,7 @@ tegra_screen_query_memory_info(struct pipe_screen *pscreen,
static const void *
tegra_screen_get_compiler_options(struct pipe_screen *pscreen,
enum pipe_shader_ir ir,
unsigned int shader)
enum pipe_shader_type shader)
{
struct tegra_screen *screen = to_tegra_screen(pscreen);
const void *options = NULL;

View file

@ -346,7 +346,7 @@ v3d_screen_get_paramf(struct pipe_screen *pscreen, enum pipe_capf param)
}
static int
v3d_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader,
v3d_screen_get_shader_param(struct pipe_screen *pscreen, enum pipe_shader_type shader,
enum pipe_shader_cap param)
{
struct v3d_screen *screen = v3d_screen(pscreen);
@ -745,7 +745,7 @@ static const nir_shader_compiler_options v3d_nir_options = {
static const void *
v3d_screen_get_compiler_options(struct pipe_screen *pscreen,
enum pipe_shader_ir ir, unsigned shader)
enum pipe_shader_ir ir, enum pipe_shader_type shader)
{
return &v3d_nir_options;
}

View file

@ -456,7 +456,7 @@ v3d_vertex_state_bind(struct pipe_context *pctx, void *hwcso)
}
static void
v3d_set_constant_buffer(struct pipe_context *pctx, uint shader, uint index,
v3d_set_constant_buffer(struct pipe_context *pctx, enum pipe_shader_type shader, uint index,
bool take_ownership,
const struct pipe_constant_buffer *cb)
{

View file

@ -1010,7 +1010,7 @@ fixup_renderer(union virgl_caps *caps)
static const void *
virgl_get_compiler_options(struct pipe_screen *pscreen,
enum pipe_shader_ir ir,
unsigned shader)
enum pipe_shader_type shader)
{
struct virgl_screen *vscreen = virgl_screen(pscreen);

View file

@ -571,7 +571,7 @@ struct pipe_screen {
*/
bool (*is_parallel_shader_compilation_finished)(struct pipe_screen *screen,
void *shader,
unsigned shader_type);
enum pipe_shader_type shader_type);
/**
* Set the damage region (called when KHR_partial_update() is invoked).