fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 05:08:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa/st: rename DrawGalliumComplex -> DrawGalliumMultiMode

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10166>
This commit is contained in:
Mike Blumenkrantz 2021-04-19 09:33:15 -04:00 • committed by Marge Bot
parent 4566383ae4
commit 7ed8e5db3a
8 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/common/driverfuncs.c
View file

@ -122,7 +122,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
/* Draw functions */
driver->Draw = NULL;
driver->DrawGallium = _mesa_draw_gallium_fallback;
driver->DrawGalliumComplex = _mesa_draw_gallium_complex_fallback;
driver->DrawGalliumMultiMode = _mesa_draw_gallium_multimode_fallback;
driver->DrawIndirect = NULL;
driver->DrawTransformFeedback = NULL;

2
src/mesa/main/dd.h
View file

@ -596,7 +596,7 @@ struct dd_function_table {
*
* This function exists to decrease complexity of DrawGallium.
*/
void (*DrawGalliumComplex)(struct gl_context *ctx,
void (*DrawGalliumMultiMode)(struct gl_context *ctx,
struct pipe_draw_info *info,
const struct pipe_draw_start_count_bias *draws,
const unsigned char *mode,

2
src/mesa/main/draw.c
View file

@ -1064,7 +1064,7 @@ _mesa_draw_gallium_fallback(struct gl_context *ctx,
* Called via Driver.DrawGallium. This is a fallback invoking Driver.Draw.
*/
void
_mesa_draw_gallium_complex_fallback(struct gl_context *ctx,
_mesa_draw_gallium_multimode_fallback(struct gl_context *ctx,
struct pipe_draw_info *info,
const struct pipe_draw_start_count_bias *draws,
const unsigned char *mode,

2
src/mesa/main/draw.h
View file

@ -94,7 +94,7 @@ _mesa_draw_gallium_fallback(struct gl_context *ctx,
unsigned num_draws);
void
_mesa_draw_gallium_complex_fallback(struct gl_context *ctx,
_mesa_draw_gallium_multimode_fallback(struct gl_context *ctx,
struct pipe_draw_info *info,
const struct pipe_draw_start_count_bias *draws,
const unsigned char *mode,

4
src/mesa/state_tracker/st_cb_feedback.c
View file

@ -294,7 +294,7 @@ st_RenderMode(struct gl_context *ctx, GLenum newMode )
/* Plug in new vbo draw function */
ctx->Driver.Draw = st_feedback_draw_vbo;
ctx->Driver.DrawGallium = _mesa_draw_gallium_fallback;
ctx->Driver.DrawGalliumComplex = _mesa_draw_gallium_complex_fallback;
ctx->Driver.DrawGalliumMultiMode = _mesa_draw_gallium_multimode_fallback;
}
else {
struct gl_program *vp = st->ctx->VertexProgram._Current;
@ -305,7 +305,7 @@ st_RenderMode(struct gl_context *ctx, GLenum newMode )
/* Plug in new vbo draw function */
ctx->Driver.Draw = st_feedback_draw_vbo;
ctx->Driver.DrawGallium = _mesa_draw_gallium_fallback;
ctx->Driver.DrawGalliumComplex = _mesa_draw_gallium_complex_fallback;
ctx->Driver.DrawGalliumMultiMode = _mesa_draw_gallium_multimode_fallback;
/* need to generate/use a vertex program that emits pos/color/tex */
if (vp)
st->dirty |= ST_NEW_VERTEX_PROGRAM(st, st_program(vp));

4
src/mesa/state_tracker/st_draw.c
View file

@ -187,7 +187,7 @@ st_draw_gallium(struct gl_context *ctx,
}
static void
st_draw_gallium_complex(struct gl_context *ctx,
st_draw_gallium_multimode(struct gl_context *ctx,
struct pipe_draw_info *info,
const struct pipe_draw_start_count_bias *draws,
const unsigned char *mode,
@ -316,7 +316,7 @@ st_init_draw_functions(struct dd_function_table *functions)
{
functions->Draw = NULL;
functions->DrawGallium = st_draw_gallium;
functions->DrawGalliumComplex = st_draw_gallium_complex;
functions->DrawGalliumMultiMode = st_draw_gallium_multimode;
functions->DrawIndirect = st_indirect_draw_vbo;
functions->DrawTransformFeedback = st_draw_transform_feedback;
}

2
src/mesa/vbo/vbo_exec_draw.c
View file

@ -333,7 +333,7 @@ vbo_exec_vtx_flush(struct vbo_exec_context *exec)
exec->vtx.info.vertices_per_patch =
ctx->TessCtrlProgram.patch_vertices;
ctx->Driver.DrawGalliumComplex(ctx, &exec->vtx.info,
ctx->Driver.DrawGalliumMultiMode(ctx, &exec->vtx.info,
exec->vtx.draw,
exec->vtx.mode,
exec->vtx.prim_count);

2
src/mesa/vbo/vbo_save_draw.c
View file

@ -235,7 +235,7 @@ vbo_save_playback_vertex_list(struct gl_context *ctx, void *data)
info->vertices_per_patch = ctx->TessCtrlProgram.patch_vertices;
void *gl_bo = info->index.gl_bo;
if (node->merged.mode) {
ctx->Driver.DrawGalliumComplex(ctx, info,
ctx->Driver.DrawGalliumMultiMode(ctx, info,
node->merged.start_count,
node->merged.mode,
node->merged.num_draws);