Mesa (master): mesa/st: rename DrawGalliumComplex -> DrawGalliumMultiMode
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Apr 30 04:22:59 UTC 2021
Module: Mesa
Branch: master
Commit: 7ed8e5db3aa52c7ac5d8209d731f02b354a31815
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7ed8e5db3aa52c7ac5d8209d731f02b354a31815
Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date: Mon Apr 19 09:33:15 2021 -0400
mesa/st: rename DrawGalliumComplex -> DrawGalliumMultiMode
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10166>
---
src/mesa/drivers/common/driverfuncs.c | 2 +-
src/mesa/main/dd.h | 2 +-
src/mesa/main/draw.c | 2 +-
src/mesa/main/draw.h | 2 +-
src/mesa/state_tracker/st_cb_feedback.c | 4 ++--
src/mesa/state_tracker/st_draw.c | 4 ++--
src/mesa/vbo/vbo_exec_draw.c | 2 +-
src/mesa/vbo/vbo_save_draw.c | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 4c07c7c8ae0..47a10c033a0 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -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;
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 045d204062d..800b3e81805 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -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,
diff --git a/src/mesa/main/draw.c b/src/mesa/main/draw.c
index ce3507e49d7..38d404030e4 100644
--- a/src/mesa/main/draw.c
+++ b/src/mesa/main/draw.c
@@ -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,
diff --git a/src/mesa/main/draw.h b/src/mesa/main/draw.h
index b65400f58b1..bb7fe6d0c95 100644
--- a/src/mesa/main/draw.h
+++ b/src/mesa/main/draw.h
@@ -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,
diff --git a/src/mesa/state_tracker/st_cb_feedback.c b/src/mesa/state_tracker/st_cb_feedback.c
index 7ff1607b4bf..11ca9df913a 100644
--- a/src/mesa/state_tracker/st_cb_feedback.c
+++ b/src/mesa/state_tracker/st_cb_feedback.c
@@ -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));
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index da24e76caf9..35073c66f13 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -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;
}
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index 4914cec8e7b..dc634979647 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -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);
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index 4a8b9d7db86..3020c105c64 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -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);
More information about the mesa-commit
mailing list