mesa: remove unused drawid_offset parameter from DrawGalliumMultiMode
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11939>
This commit is contained in:
parent
703279e6da
commit
73a03d12e9
|
@ -588,18 +588,14 @@ struct dd_function_table {
|
||||||
/**
|
/**
|
||||||
* Same as DrawGallium, but mode can also change between draws.
|
* Same as DrawGallium, but mode can also change between draws.
|
||||||
*
|
*
|
||||||
* If mode != NULL, mode changes for each draw.
|
|
||||||
* At least one of them must be non-NULL.
|
|
||||||
*
|
|
||||||
* "info" is not const and the following fields can be changed by
|
* "info" is not const and the following fields can be changed by
|
||||||
* the callee in addition to the fields listed by DrawGallium:
|
* the callee in addition to the fields listed by DrawGallium:
|
||||||
* - info->mode (if mode != NULL)
|
* - info->mode
|
||||||
*
|
*
|
||||||
* This function exists to decrease complexity of DrawGallium.
|
* This function exists to decrease complexity of DrawGallium.
|
||||||
*/
|
*/
|
||||||
void (*DrawGalliumMultiMode)(struct gl_context *ctx,
|
void (*DrawGalliumMultiMode)(struct gl_context *ctx,
|
||||||
struct pipe_draw_info *info,
|
struct pipe_draw_info *info,
|
||||||
unsigned drawid_offset,
|
|
||||||
const struct pipe_draw_start_count_bias *draws,
|
const struct pipe_draw_start_count_bias *draws,
|
||||||
const unsigned char *mode,
|
const unsigned char *mode,
|
||||||
unsigned num_draws);
|
unsigned num_draws);
|
||||||
|
|
|
@ -1067,7 +1067,6 @@ _mesa_draw_gallium_fallback(struct gl_context *ctx,
|
||||||
void
|
void
|
||||||
_mesa_draw_gallium_multimode_fallback(struct gl_context *ctx,
|
_mesa_draw_gallium_multimode_fallback(struct gl_context *ctx,
|
||||||
struct pipe_draw_info *info,
|
struct pipe_draw_info *info,
|
||||||
unsigned drawid_offset,
|
|
||||||
const struct pipe_draw_start_count_bias *draws,
|
const struct pipe_draw_start_count_bias *draws,
|
||||||
const unsigned char *mode,
|
const unsigned char *mode,
|
||||||
unsigned num_draws)
|
unsigned num_draws)
|
||||||
|
@ -1078,7 +1077,7 @@ _mesa_draw_gallium_multimode_fallback(struct gl_context *ctx,
|
||||||
for (i = 0, first = 0; i <= num_draws; i++) {
|
for (i = 0, first = 0; i <= num_draws; i++) {
|
||||||
if (i == num_draws || mode[i] != mode[first]) {
|
if (i == num_draws || mode[i] != mode[first]) {
|
||||||
info->mode = mode[first];
|
info->mode = mode[first];
|
||||||
ctx->Driver.DrawGallium(ctx, info, drawid_offset, &draws[first], i - first);
|
ctx->Driver.DrawGallium(ctx, info, 0, &draws[first], i - first);
|
||||||
first = i;
|
first = i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,7 +97,6 @@ _mesa_draw_gallium_fallback(struct gl_context *ctx,
|
||||||
void
|
void
|
||||||
_mesa_draw_gallium_multimode_fallback(struct gl_context *ctx,
|
_mesa_draw_gallium_multimode_fallback(struct gl_context *ctx,
|
||||||
struct pipe_draw_info *info,
|
struct pipe_draw_info *info,
|
||||||
unsigned drawid_offset,
|
|
||||||
const struct pipe_draw_start_count_bias *draws,
|
const struct pipe_draw_start_count_bias *draws,
|
||||||
const unsigned char *mode,
|
const unsigned char *mode,
|
||||||
unsigned num_draws);
|
unsigned num_draws);
|
||||||
|
|
|
@ -190,7 +190,6 @@ st_draw_gallium(struct gl_context *ctx,
|
||||||
static void
|
static void
|
||||||
st_draw_gallium_multimode(struct gl_context *ctx,
|
st_draw_gallium_multimode(struct gl_context *ctx,
|
||||||
struct pipe_draw_info *info,
|
struct pipe_draw_info *info,
|
||||||
unsigned drawid_offset,
|
|
||||||
const struct pipe_draw_start_count_bias *draws,
|
const struct pipe_draw_start_count_bias *draws,
|
||||||
const unsigned char *mode,
|
const unsigned char *mode,
|
||||||
unsigned num_draws)
|
unsigned num_draws)
|
||||||
|
@ -209,7 +208,7 @@ st_draw_gallium_multimode(struct gl_context *ctx,
|
||||||
for (i = 0, first = 0; i <= num_draws; i++) {
|
for (i = 0, first = 0; i <= num_draws; i++) {
|
||||||
if (i == num_draws || mode[i] != mode[first]) {
|
if (i == num_draws || mode[i] != mode[first]) {
|
||||||
info->mode = mode[first];
|
info->mode = mode[first];
|
||||||
cso_multi_draw(cso, info, drawid_offset, &draws[first], i - first);
|
cso_multi_draw(cso, info, 0, &draws[first], i - first);
|
||||||
first = i;
|
first = i;
|
||||||
|
|
||||||
/* We can pass the reference only once. st_buffer_object keeps
|
/* We can pass the reference only once. st_buffer_object keeps
|
||||||
|
|
|
@ -333,7 +333,7 @@ vbo_exec_vtx_flush(struct vbo_exec_context *exec)
|
||||||
exec->vtx.info.vertices_per_patch =
|
exec->vtx.info.vertices_per_patch =
|
||||||
ctx->TessCtrlProgram.patch_vertices;
|
ctx->TessCtrlProgram.patch_vertices;
|
||||||
|
|
||||||
ctx->Driver.DrawGalliumMultiMode(ctx, &exec->vtx.info, 0,
|
ctx->Driver.DrawGalliumMultiMode(ctx, &exec->vtx.info,
|
||||||
exec->vtx.draw,
|
exec->vtx.draw,
|
||||||
exec->vtx.mode,
|
exec->vtx.mode,
|
||||||
exec->vtx.prim_count);
|
exec->vtx.prim_count);
|
||||||
|
|
|
@ -243,7 +243,7 @@ vbo_save_playback_vertex_list(struct gl_context *ctx, void *data, bool copy_to_c
|
||||||
info->vertices_per_patch = ctx->TessCtrlProgram.patch_vertices;
|
info->vertices_per_patch = ctx->TessCtrlProgram.patch_vertices;
|
||||||
void *gl_bo = info->index.gl_bo;
|
void *gl_bo = info->index.gl_bo;
|
||||||
if (node->merged.mode) {
|
if (node->merged.mode) {
|
||||||
ctx->Driver.DrawGalliumMultiMode(ctx, info, 0,
|
ctx->Driver.DrawGalliumMultiMode(ctx, info,
|
||||||
node->merged.start_counts,
|
node->merged.start_counts,
|
||||||
node->merged.mode,
|
node->merged.mode,
|
||||||
node->merged.num_draws);
|
node->merged.num_draws);
|
||||||
|
|
Loading…
Reference in New Issue