Mesa (main): mesa: drop unused transform feedback state driver flags
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Dec 23 19:35:09 UTC 2021
Module: Mesa
Branch: main
Commit: 75255a1d0698f76044199111f8652090ff87aba4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=75255a1d0698f76044199111f8652090ff87aba4
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Dec 20 12:49:47 2021 +1000
mesa: drop unused transform feedback state driver flags
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14261>
---
src/mesa/main/bufferobj.c | 1 -
src/mesa/main/mtypes.h | 6 ------
src/mesa/main/transformfeedback.c | 9 ++-------
src/mesa/main/transformfeedback.h | 2 +-
4 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 6b3e9d599b5..02c11179eb2 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -4670,7 +4670,6 @@ bind_xfb_buffers(struct gl_context *ctx,
/* Assume that at least one binding will be changed */
FLUSH_VERTICES(ctx, 0, 0);
- ctx->NewDriverState |= ctx->DriverFlags.NewTransformFeedback;
if (!buffers) {
/* The ARB_multi_bind spec says:
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 0b5742a827a..d7a20c66731 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -4768,12 +4768,6 @@ struct gl_dlist_state
*/
struct gl_driver_flags
{
- /** gl_context::TransformFeedback::CurrentObject */
- uint64_t NewTransformFeedback;
-
- /** gl_context::TransformFeedback::CurrentObject::shader_program */
- uint64_t NewTransformFeedbackProg;
-
/**
* gl_context::ShaderStorageBufferBindings
* gl_shader_program::ShaderStorageBlocks
diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index 60af49f2d01..946f274662e 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -391,7 +391,6 @@ begin_transform_feedback(struct gl_context *ctx, GLenum mode, bool no_error)
}
FLUSH_VERTICES(ctx, 0, 0);
- ctx->NewDriverState |= ctx->DriverFlags.NewTransformFeedback;
obj->Active = GL_TRUE;
ctx->TransformFeedback.Mode = mode;
@@ -411,7 +410,6 @@ begin_transform_feedback(struct gl_context *ctx, GLenum mode, bool no_error)
}
if (obj->program != source) {
- ctx->NewDriverState |= ctx->DriverFlags.NewTransformFeedbackProg;
_mesa_reference_program_(ctx, &obj->program, source);
obj->program = source;
}
@@ -442,7 +440,6 @@ end_transform_feedback(struct gl_context *ctx,
struct gl_transform_feedback_object *obj)
{
FLUSH_VERTICES(ctx, 0, 0);
- ctx->NewDriverState |= ctx->DriverFlags.NewTransformFeedback;
st_end_transform_feedback(ctx, obj);
@@ -491,7 +488,7 @@ bind_buffer_range(struct gl_context *ctx,
GLintptr offset, GLsizeiptr size,
bool dsa)
{
- /* Note: no need to FLUSH_VERTICES or flag NewTransformFeedback, because
+ /* Note: no need to FLUSH_VERTICES because
* transform feedback buffers can't be changed while transform feedback is
* active.
*/
@@ -831,7 +828,7 @@ transform_feedback_varyings(struct gl_context *ctx,
shProg->TransformFeedback.BufferMode = bufferMode;
- /* No need to invoke FLUSH_VERTICES or flag NewTransformFeedback since
+ /* No need to invoke FLUSH_VERTICES since
* the varyings won't be used until shader link time.
*/
}
@@ -1185,7 +1182,6 @@ pause_transform_feedback(struct gl_context *ctx,
struct gl_transform_feedback_object *obj)
{
FLUSH_VERTICES(ctx, 0, 0);
- ctx->NewDriverState |= ctx->DriverFlags.NewTransformFeedback;
st_pause_transform_feedback(ctx, obj);
@@ -1229,7 +1225,6 @@ resume_transform_feedback(struct gl_context *ctx,
struct gl_transform_feedback_object *obj)
{
FLUSH_VERTICES(ctx, 0, 0);
- ctx->NewDriverState |= ctx->DriverFlags.NewTransformFeedback;
obj->Paused = GL_FALSE;
diff --git a/src/mesa/main/transformfeedback.h b/src/mesa/main/transformfeedback.h
index 76b874fe70e..25401b9529f 100644
--- a/src/mesa/main/transformfeedback.h
+++ b/src/mesa/main/transformfeedback.h
@@ -109,7 +109,7 @@ _mesa_bind_buffer_range_xfb(struct gl_context *ctx,
GLuint index, struct gl_buffer_object *bufObj,
GLintptr offset, GLsizeiptr size)
{
- /* Note: no need to FLUSH_VERTICES or flag NewTransformFeedback, because
+ /* Note: no need to FLUSH_VERTICES because
* transform feedback buffers can't be changed while transform feedback is
* active.
*/
More information about the mesa-commit
mailing list