From: Mathias Fröhlich <mathias.froehl...@web.de>
On finishing a display list playback the VBO_SAFE_FALLBACK bit
is still kept in vbo_save_context::replay_flags. But examining
replay_flags and the display list flags that feed this value
the corresponding bit is never set these days anymore.
So, since it is nowhere set or checked, we can safely remove it.
Signed-off-by: Mathias Fröhlich <mathias.froehl...@web.de>
---
src/mesa/vbo/vbo_save.h | 2 --
src/mesa/vbo/vbo_save_api.c | 8 ++------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/mesa/vbo/vbo_save.h b/src/mesa/vbo/vbo_save.h
index 37f883e9de..d00700166e 100644
--- a/src/mesa/vbo/vbo_save.h
+++ b/src/mesa/vbo/vbo_save.h
@@ -140,8 +140,6 @@ _vbo_save_get_vertex_count(const struct
vbo_save_vertex_list *node)
#define VBO_SAVE_PRIM_WEAK 0x40
#define VBO_SAVE_PRIM_NO_CURRENT_UPDATE 0x80
-#define VBO_SAVE_FALLBACK 0x10000000
-
struct vbo_save_vertex_store {
struct gl_buffer_object *bufferobj;
fi_type *buffer_map;
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index d5b43d0684..975ba46c8e 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -1804,12 +1804,8 @@ vbo_save_EndCallList(struct gl_context *ctx)
{
struct vbo_save_context *save = &vbo_context(ctx)->save;
- if (ctx->ListState.CallDepth == 1) {
- /* This is correct: want to keep only the VBO_SAVE_FALLBACK
- * flag, if it is set:
- */
- save->replay_flags &= VBO_SAVE_FALLBACK;
- }
+ if (ctx->ListState.CallDepth == 1)
+ save->replay_flags = 0;
}
--
2.17.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
