diff options
author | Mathias Fröhlich <[email protected]> | 2018-10-29 06:13:19 +0100 |
---|---|---|
committer | Mathias Fröhlich <[email protected]> | 2018-11-01 06:08:49 +0100 |
commit | 873adb06fadd33ba09cbe50678e96ec5ca294e0d (patch) | |
tree | 083d2ad50b7da2b00f16c261de1693f49ce90c12 | |
parent | 1387b4d53385c6827d785b3c858d9e585ee8883e (diff) |
vbo: Remove the always false branch dlist replay.
The previous patch left a constant if (0) in the code.
Clean that up now.
Reviewed-by: Brian Paul <[email protected]>
Signed-off-by: Mathias Fröhlich <[email protected]>
-rw-r--r-- | src/mesa/vbo/vbo_save_loopback.c | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/src/mesa/vbo/vbo_save_loopback.c b/src/mesa/vbo/vbo_save_loopback.c index 5d4d9c574e5..eeb4580c54c 100644 --- a/src/mesa/vbo/vbo_save_loopback.c +++ b/src/mesa/vbo/vbo_save_loopback.c @@ -133,30 +133,6 @@ loopback_prim(struct gl_context *ctx, } -/** - * Primitives generated by DrawArrays/DrawElements/Rectf may be - * caught here. If there is no primitive in progress, execute them - * normally, otherwise need to track and discard the generated - * primitives. - */ -static void -loopback_weak_prim(struct gl_context *ctx, - const struct _mesa_prim *prim) -{ - /* Use the prim_weak flag to ensure that if this primitive - * wraps, we don't mistake future vertex_lists for part of the - * surrounding primitive. - * - * While this flag is set, we are simply disposing of data - * generated by an operation now known to be a noop. - */ - if (prim->begin) - ctx->Driver.CurrentExecPrimitive |= VBO_SAVE_PRIM_WEAK; - if (prim->end) - ctx->Driver.CurrentExecPrimitive &= ~VBO_SAVE_PRIM_WEAK; -} - - static inline void append_attr(GLuint *nr, struct loopback_attr la[], int i, int shift, const struct gl_vertex_array_object *vao) @@ -227,10 +203,6 @@ _vbo_loopback_vertex_list(struct gl_context *ctx, const struct _mesa_prim *prims = node->prims; const GLuint prim_count = node->prim_count; for (GLuint i = 0; i < prim_count; i++) { - if ((0) && _mesa_inside_begin_end(ctx)) { - loopback_weak_prim(ctx, &prims[i]); - } else { - loopback_prim(ctx, buffer, &prims[i], wrap_count, stride, la, nr); - } + loopback_prim(ctx, buffer, &prims[i], wrap_count, stride, la, nr); } } |