From 47d7e21619218348c86ca6909cf695f78c9778c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 3 Feb 2020 20:40:09 -0500 Subject: [PATCH] mesa: remove unused _mesa_prim::is_indirect MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Mathias Fröhlich Part-of: --- src/mesa/main/draw.c | 6 ------ src/mesa/main/draw.h | 3 +-- src/mesa/state_tracker/st_cb_rasterpos.c | 1 - src/mesa/vbo/vbo_exec_api.c | 1 - src/mesa/vbo/vbo_primitive_restart.c | 1 - src/mesa/vbo/vbo_save_api.c | 2 -- 6 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/mesa/main/draw.c b/src/mesa/main/draw.c index bfa318553f6..09170525ab7 100644 --- a/src/mesa/main/draw.c +++ b/src/mesa/main/draw.c @@ -367,7 +367,6 @@ _mesa_draw_arrays(struct gl_context *ctx, GLenum mode, GLint start, prim.num_instances = numInstances; prim.base_instance = baseInstance; prim.draw_id = drawID; - prim.is_indirect = 0; prim.start = start; prim.count = count; @@ -776,7 +775,6 @@ _mesa_validated_drawrangeelements(struct gl_context *ctx, GLenum mode, prim.start = 0; prim.count = count; prim.indexed = 1; - prim.is_indirect = 0; prim.basevertex = basevertex; prim.num_instances = numInstances; prim.base_instance = baseInstance; @@ -1239,7 +1237,6 @@ _mesa_validated_multidrawelements(struct gl_context *ctx, GLenum mode, prim[i].num_instances = 1; prim[i].base_instance = 0; prim[i].draw_id = i; - prim[i].is_indirect = 0; if (basevertex != NULL) prim[i].basevertex = basevertex[i]; else @@ -1269,7 +1266,6 @@ _mesa_validated_multidrawelements(struct gl_context *ctx, GLenum mode, prim[0].num_instances = 1; prim[0].base_instance = 0; prim[0].draw_id = i; - prim[0].is_indirect = 0; if (basevertex != NULL) prim[0].basevertex = basevertex[i]; else @@ -1387,7 +1383,6 @@ _mesa_draw_transform_feedback(struct gl_context *ctx, GLenum mode, prim.mode = mode; prim.num_instances = numInstances; prim.base_instance = 0; - prim.is_indirect = 0; /* Maybe we should do some primitive splitting for primitive restart * (like in DrawArrays), but we have no way to know how many vertices @@ -2093,7 +2088,6 @@ draw_indirect(struct gl_context *ctx, GLuint mode, prim[i].mode = mode; prim[i].indexed = !!ib; prim[i].indirect_offset = indirect_offset; - prim[i].is_indirect = 1; prim[i].draw_id = i; } diff --git a/src/mesa/main/draw.h b/src/mesa/main/draw.h index b8e61132137..86b0527ffc4 100644 --- a/src/mesa/main/draw.h +++ b/src/mesa/main/draw.h @@ -46,8 +46,7 @@ struct _mesa_prim GLuint indexed:1; GLuint begin:1; GLuint end:1; - GLuint is_indirect:1; - GLuint pad:20; + GLuint pad:21; GLuint start; GLuint count; diff --git a/src/mesa/state_tracker/st_cb_rasterpos.c b/src/mesa/state_tracker/st_cb_rasterpos.c index 108b11ede41..a69b0a651c3 100644 --- a/src/mesa/state_tracker/st_cb_rasterpos.c +++ b/src/mesa/state_tracker/st_cb_rasterpos.c @@ -213,7 +213,6 @@ new_draw_rastpos_stage(struct gl_context *ctx, struct draw_context *draw) rs->prim.pad = 0; rs->prim.num_instances = 1; rs->prim.base_instance = 0; - rs->prim.is_indirect = 0; return rs; } diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 75895316293..f106fc2d970 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -823,7 +823,6 @@ vbo_exec_Begin(GLenum mode) exec->vtx.prim[i].count = 0; exec->vtx.prim[i].num_instances = 1; exec->vtx.prim[i].base_instance = 0; - exec->vtx.prim[i].is_indirect = 0; ctx->Driver.CurrentExecPrimitive = mode; diff --git a/src/mesa/vbo/vbo_primitive_restart.c b/src/mesa/vbo/vbo_primitive_restart.c index 8d279fd637a..1faf3a68229 100644 --- a/src/mesa/vbo/vbo_primitive_restart.c +++ b/src/mesa/vbo/vbo_primitive_restart.c @@ -198,7 +198,6 @@ vbo_sw_primitive_restart(struct gl_context *ctx, ADD_POINTERS(indirect->Mappings[MAP_INTERNAL].Pointer, new_prim.indirect_offset); - new_prim.is_indirect = 0; new_prim.count = indirect_params[0]; new_prim.num_instances = indirect_params[1]; new_prim.start = indirect_params[2]; diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index aff90bf8023..57984684899 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -742,7 +742,6 @@ wrap_buffers(struct gl_context *ctx) save->prims[0].count = 0; save->prims[0].num_instances = 1; save->prims[0].base_instance = 0; - save->prims[0].is_indirect = 0; save->prim_count = 1; } @@ -1223,7 +1222,6 @@ vbo_save_NotifyBegin(struct gl_context *ctx, GLenum mode, save->prims[i].count = 0; save->prims[i].num_instances = 1; save->prims[i].base_instance = 0; - save->prims[i].is_indirect = 0; save->no_current_update = no_current_update; -- 2.30.2