Mesa (master): st/mesa: rename some vars related to indirect draw count
Brian Paul
brianp at kemper.freedesktop.org
Thu Feb 8 17:31:20 UTC 2018
Module: Mesa
Branch: master
Commit: 5cf342704d4a481845f2f7c921dda5df5cf5a256
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5cf342704d4a481845f2f7c921dda5df5cf5a256
Author: Brian Paul <brianp at vmware.com>
Date: Wed Jan 31 15:01:09 2018 -0700
st/mesa: rename some vars related to indirect draw count
'indirect_params' was a bit vague. Use the names that we use in
gallium's pipe_draw_indirect_info.
Reviewed-by: Mathias Fröhlich <mathias.froehlich at web.de>
Reviewed-by: Roland Scheidegger <sroland at vmware.com>
---
src/mesa/state_tracker/st_draw.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 2fe7070bca..b95a2522b2 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -235,8 +235,8 @@ st_indirect_draw_vbo(struct gl_context *ctx,
GLsizeiptr indirect_offset,
unsigned draw_count,
unsigned stride,
- struct gl_buffer_object *indirect_params,
- GLsizeiptr indirect_params_offset,
+ struct gl_buffer_object *indirect_draw_count,
+ GLsizeiptr indirect_draw_count_offset,
const struct _mesa_index_buffer *ib)
{
struct st_context *st = st_context(ctx);
@@ -283,7 +283,7 @@ st_indirect_draw_vbo(struct gl_context *ctx,
if (!st->has_multi_draw_indirect) {
int i;
- assert(!indirect_params);
+ assert(!indirect_draw_count);
indirect.draw_count = 1;
for (i = 0; i < draw_count; i++) {
info.drawid = i;
@@ -293,9 +293,10 @@ st_indirect_draw_vbo(struct gl_context *ctx,
} else {
indirect.draw_count = draw_count;
indirect.stride = stride;
- if (indirect_params) {
- indirect.indirect_draw_count = st_buffer_object(indirect_params)->buffer;
- indirect.indirect_draw_count_offset = indirect_params_offset;
+ if (indirect_draw_count) {
+ indirect.indirect_draw_count =
+ st_buffer_object(indirect_draw_count)->buffer;
+ indirect.indirect_draw_count_offset = indirect_draw_count_offset;
}
cso_draw_vbo(st->cso_context, &info);
}
More information about the mesa-commit
mailing list