summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorErik Faye-Lund <[email protected]>2019-03-07 13:21:50 +0100
committerErik Faye-Lund <[email protected]>2019-04-29 10:28:38 +0000
commitcc5b8a938a4064c26bd9cd034ad2cafedb04ee9a (patch)
tree13be860c82992dce6a40367fa23cbca0250ca010 /src/mesa
parentbe110ba2e4d5f8e5c71294d29dc991f4b6600e79 (diff)
mesa/st: remove always-false state
This code is essentially dead now. Signed-off-by: Erik Faye-Lund <[email protected]> Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/state_tracker/st_atom_array.c3
-rw-r--r--src/mesa/state_tracker/st_context.h1
-rw-r--r--src/mesa/state_tracker/st_draw.c6
3 files changed, 0 insertions, 10 deletions
diff --git a/src/mesa/state_tracker/st_atom_array.c b/src/mesa/state_tracker/st_atom_array.c
index a726d06cd4a..89a0923fbbe 100644
--- a/src/mesa/state_tracker/st_atom_array.c
+++ b/src/mesa/state_tracker/st_atom_array.c
@@ -546,14 +546,11 @@ st_update_array(struct st_context *st)
struct pipe_vertex_element velements[PIPE_MAX_ATTRIBS];
unsigned num_velements;
- st->vertex_array_out_of_memory = FALSE;
st->draw_needs_minmax_index = false;
/* ST_NEW_VERTEX_ARRAYS alias ctx->DriverFlags.NewArray */
/* Setup arrays */
st_setup_arrays(st, vp, vp_variant, velements, vbuffer, &num_vbuffers);
- if (st->vertex_array_out_of_memory)
- return;
/* _NEW_CURRENT_ATTRIB */
/* Setup current uploads */
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index c87ff81f973..b486ed68fce 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -162,7 +162,6 @@ struct st_context
*/
boolean invalidate_on_gl_viewport;
boolean draw_needs_minmax_index;
- boolean vertex_array_out_of_memory;
boolean has_hw_atomics;
/* Some state is contained in constant objects.
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index 7485fc82b18..266695f0c03 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -183,9 +183,6 @@ st_draw_vbo(struct gl_context *ctx,
prepare_draw(st, ctx);
- if (st->vertex_array_out_of_memory)
- return;
-
/* Initialize pipe_draw_info. */
info.primitive_restart = false;
info.vertices_per_patch = ctx->TessCtrlProgram.patch_vertices;
@@ -290,9 +287,6 @@ st_indirect_draw_vbo(struct gl_context *ctx,
assert(stride);
prepare_draw(st, ctx);
- if (st->vertex_array_out_of_memory)
- return;
-
memset(&indirect, 0, sizeof(indirect));
util_draw_init_info(&info);
info.start = 0; /* index offset / index size */