summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mesa/drivers/dri/i965/brw_draw.c12
-rw-r--r--src/mesa/drivers/dri/i965/brw_draw.h12
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c8
-rw-r--r--src/mesa/main/dd.h8
-rw-r--r--src/mesa/main/draw.c2
-rw-r--r--src/mesa/state_tracker/st_draw.c12
-rw-r--r--src/mesa/state_tracker/st_draw.h12
-rw-r--r--src/mesa/state_tracker/st_draw_feedback.c12
-rw-r--r--src/mesa/tnl/t_draw.c6
-rw-r--r--src/mesa/tnl/tnl.h6
-rw-r--r--src/mesa/vbo/vbo_exec_draw.c2
-rw-r--r--src/mesa/vbo/vbo_primitive_restart.c4
-rw-r--r--src/mesa/vbo/vbo_save_draw.c2
13 files changed, 49 insertions, 49 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index 25162ca7825..3f32f00437e 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -1134,13 +1134,13 @@ retry:
void
brw_draw_prims(struct gl_context *ctx,
const struct _mesa_prim *prims,
- GLuint nr_prims,
+ unsigned nr_prims,
const struct _mesa_index_buffer *ib,
- GLboolean index_bounds_valid,
- GLuint min_index,
- GLuint max_index,
- GLuint num_instances,
- GLuint base_instance)
+ bool index_bounds_valid,
+ unsigned min_index,
+ unsigned max_index,
+ unsigned num_instances,
+ unsigned base_instance)
{
unsigned i;
struct brw_context *brw = brw_context(ctx);
diff --git a/src/mesa/drivers/dri/i965/brw_draw.h b/src/mesa/drivers/dri/i965/brw_draw.h
index 9331d5468d2..06f127b83cd 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.h
+++ b/src/mesa/drivers/dri/i965/brw_draw.h
@@ -46,13 +46,13 @@ brw_emit_vertex_buffer_state(struct brw_context *brw,
void brw_draw_prims(struct gl_context *ctx,
const struct _mesa_prim *prims,
- GLuint nr_prims,
+ unsigned nr_prims,
const struct _mesa_index_buffer *ib,
- GLboolean index_bounds_valid,
- GLuint min_index,
- GLuint max_index,
- GLuint num_instances,
- GLuint base_instance);
+ bool index_bounds_valid,
+ unsigned min_index,
+ unsigned max_index,
+ unsigned num_instances,
+ unsigned base_instance);
void brw_init_draw_functions(struct dd_function_table *functions);
void brw_draw_init( struct brw_context *brw );
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
index 9248d097119..e27862df82e 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_vbo_t.c
@@ -542,11 +542,11 @@ TAG(vbo_check_render_prims)(struct gl_context *ctx,
static void
TAG(vbo_draw)(struct gl_context *ctx,
- const struct _mesa_prim *prims, GLuint nr_prims,
+ const struct _mesa_prim *prims, unsigned nr_prims,
const struct _mesa_index_buffer *ib,
- GLboolean index_bounds_valid,
- GLuint min_index, GLuint max_index,
- GLuint num_instances, GLuint base_instance)
+ bool index_bounds_valid,
+ unsigned min_index, unsigned max_index,
+ unsigned num_instances, unsigned base_instance)
{
/* Borrow and update the inputs list from the tnl context */
const struct tnl_vertex_array* arrays = _tnl_bind_inputs(ctx);
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index ae30f2b1423..e668c2d35e1 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -546,11 +546,11 @@ struct dd_function_table {
* \param base_instance base instance from ARB_base_instance
*/
void (*Draw)(struct gl_context *ctx,
- const struct _mesa_prim *prims, GLuint nr_prims,
+ const struct _mesa_prim *prims, unsigned nr_prims,
const struct _mesa_index_buffer *ib,
- GLboolean index_bounds_valid,
- GLuint min_index, GLuint max_index,
- GLuint num_instances, GLuint base_instance);
+ bool index_bounds_valid,
+ unsigned min_index, unsigned max_index,
+ unsigned num_instances, unsigned base_instance);
/**
diff --git a/src/mesa/main/draw.c b/src/mesa/main/draw.c
index 0d7258eaa3b..570db9069db 100644
--- a/src/mesa/main/draw.c
+++ b/src/mesa/main/draw.c
@@ -365,7 +365,7 @@ _mesa_draw_arrays(struct gl_context *ctx, GLenum mode, GLint start,
};
ctx->Driver.Draw(ctx, &prim, 1, NULL,
- GL_TRUE, start, start + count - 1,
+ true, start, start + count - 1,
numInstances, baseInstance);
if (MESA_DEBUG_FLAGS & DEBUG_ALWAYS_FLUSH) {
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 9f66614dafc..16298e177b2 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -158,13 +158,13 @@ prepare_draw(struct st_context *st, struct gl_context *ctx)
static void
st_draw_vbo(struct gl_context *ctx,
const struct _mesa_prim *prims,
- GLuint nr_prims,
+ unsigned nr_prims,
const struct _mesa_index_buffer *ib,
- GLboolean index_bounds_valid,
- GLuint min_index,
- GLuint max_index,
- GLuint num_instances,
- GLuint base_instance)
+ bool index_bounds_valid,
+ unsigned min_index,
+ unsigned max_index,
+ unsigned num_instances,
+ unsigned base_instance)
{
struct st_context *st = st_context(ctx);
struct pipe_draw_info info;
diff --git a/src/mesa/state_tracker/st_draw.h b/src/mesa/state_tracker/st_draw.h
index c87727d28f8..ddb2d570e0e 100644
--- a/src/mesa/state_tracker/st_draw.h
+++ b/src/mesa/state_tracker/st_draw.h
@@ -50,13 +50,13 @@ struct draw_context *st_get_draw_context(struct st_context *st);
extern void
st_feedback_draw_vbo(struct gl_context *ctx,
const struct _mesa_prim *prims,
- GLuint nr_prims,
+ unsigned nr_prims,
const struct _mesa_index_buffer *ib,
- GLboolean index_bounds_valid,
- GLuint min_index,
- GLuint max_index,
- GLuint num_instances,
- GLuint base_instance);
+ bool index_bounds_valid,
+ unsigned min_index,
+ unsigned max_index,
+ unsigned num_instances,
+ unsigned base_instance);
/**
* When drawing with VBOs, the addresses specified with
diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c
index ef78f824139..45d325551e3 100644
--- a/src/mesa/state_tracker/st_draw_feedback.c
+++ b/src/mesa/state_tracker/st_draw_feedback.c
@@ -95,13 +95,13 @@ set_feedback_vertex_format(struct gl_context *ctx)
void
st_feedback_draw_vbo(struct gl_context *ctx,
const struct _mesa_prim *prims,
- GLuint nr_prims,
+ unsigned nr_prims,
const struct _mesa_index_buffer *ib,
- GLboolean index_bounds_valid,
- GLuint min_index,
- GLuint max_index,
- GLuint num_instances,
- GLuint base_instance)
+ bool index_bounds_valid,
+ unsigned min_index,
+ unsigned max_index,
+ unsigned num_instances,
+ unsigned base_instance)
{
struct st_context *st = st_context(ctx);
struct pipe_context *pipe = st->pipe;
diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c
index cf23c01ba6d..5d1bc09b80b 100644
--- a/src/mesa/tnl/t_draw.c
+++ b/src/mesa/tnl/t_draw.c
@@ -628,10 +628,10 @@ _tnl_bind_inputs(struct gl_context *ctx)
*/
void
_tnl_draw(struct gl_context *ctx,
- const struct _mesa_prim *prim, GLuint nr_prims,
+ const struct _mesa_prim *prim, unsigned nr_prims,
const struct _mesa_index_buffer *ib,
- GLboolean index_bounds_valid, GLuint min_index, GLuint max_index,
- GLuint num_instances, GLuint base_instance)
+ bool index_bounds_valid, unsigned min_index, unsigned max_index,
+ unsigned num_instances, unsigned base_instance)
{
/* Update TNLcontext::draw_arrays and return that pointer.
*/
diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h
index 5c87ab6a4b7..56d541fee35 100644
--- a/src/mesa/tnl/tnl.h
+++ b/src/mesa/tnl/tnl.h
@@ -112,10 +112,10 @@ _tnl_draw_prims(struct gl_context *ctx,
void
_tnl_draw(struct gl_context *ctx,
- const struct _mesa_prim *prim, GLuint nr_prims,
+ const struct _mesa_prim *prim, unsigned nr_prims,
const struct _mesa_index_buffer *ib,
- GLboolean index_bounds_valid, GLuint min_index, GLuint max_index,
- GLuint num_instances, GLuint base_instance);
+ bool index_bounds_valid, unsigned min_index, unsigned max_index,
+ unsigned num_instances, unsigned base_instance);
extern void
_tnl_RasterPos(struct gl_context *ctx, const GLfloat vObj[4]);
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index ae14478c260..e454d237194 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -325,7 +325,7 @@ vbo_exec_vtx_flush(struct vbo_exec_context *exec)
exec->vtx.vert_count);
ctx->Driver.Draw(ctx, exec->vtx.prim, exec->vtx.prim_count,
- NULL, GL_TRUE, 0, exec->vtx.vert_count - 1, 1, 0);
+ NULL, true, 0, exec->vtx.vert_count - 1, 1, 0);
/* Get new storage -- unless asked not to. */
if (!persistent_mapping)
diff --git a/src/mesa/vbo/vbo_primitive_restart.c b/src/mesa/vbo/vbo_primitive_restart.c
index 8dce7d67366..3df81108c41 100644
--- a/src/mesa/vbo/vbo_primitive_restart.c
+++ b/src/mesa/vbo/vbo_primitive_restart.c
@@ -252,12 +252,12 @@ vbo_sw_primitive_restart(struct gl_context *ctx,
temp_prim.count = MIN2(sub_end_index, end_index) - temp_prim.start;
if ((temp_prim.start == sub_prim->start) &&
(temp_prim.count == sub_prim->count)) {
- ctx->Driver.Draw(ctx, &temp_prim, 1, ib, GL_TRUE,
+ ctx->Driver.Draw(ctx, &temp_prim, 1, ib, true,
sub_prim->min_index, sub_prim->max_index,
num_instances, base_instance);
} else {
ctx->Driver.Draw(ctx, &temp_prim, 1, ib,
- GL_FALSE, -1, -1,
+ false, -1, -1,
num_instances, base_instance);
}
}
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index 8df082fb0ab..397b07f8688 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -212,7 +212,7 @@ vbo_save_playback_vertex_list(struct gl_context *ctx, void *data)
if (node->vertex_count > 0) {
GLuint min_index = _vbo_save_get_min_index(node);
GLuint max_index = _vbo_save_get_max_index(node);
- ctx->Driver.Draw(ctx, node->prims, node->prim_count, NULL, GL_TRUE,
+ ctx->Driver.Draw(ctx, node->prims, node->prim_count, NULL, true,
min_index, max_index, 1, 0);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 10:17:02 +0000