Mesa (main): mesa/st: drop ssbo, image and sampler driver state flags bits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Dec 23 19:35:09 UTC 2021
Module: Mesa
Branch: main
Commit: 42c7570eed27d33fc1963a6ca351767c0cd1cc0e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=42c7570eed27d33fc1963a6ca351767c0cd1cc0e
Author: Dave Airlie <airlied at redhat.com>
Date: Mon Dec 20 12:56:03 2021 +1000
mesa/st: drop ssbo, image and sampler driver state flags bits
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 | 4 ++--
src/mesa/main/mtypes.h | 13 -------------
src/mesa/main/shaderimage.c | 6 ++++--
src/mesa/main/teximage.c | 3 ++-
src/mesa/main/uniform_query.cpp | 3 ++-
src/mesa/main/uniforms.c | 2 +-
src/mesa/state_tracker/st_context.c | 3 ---
7 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 02c11179eb2..3214acdc3c8 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1720,7 +1720,7 @@ bind_shader_storage_buffer(struct gl_context *ctx,
{
bind_buffer(ctx, &ctx->ShaderStorageBufferBindings[index],
bufObj, offset, size, autoSize,
- ctx->DriverFlags.NewShaderStorageBuffer,
+ ST_NEW_STORAGE_BUFFER,
USAGE_SHADER_STORAGE_BUFFER);
}
@@ -4502,7 +4502,7 @@ bind_shader_storage_buffers(struct gl_context *ctx, GLuint first,
/* Assume that at least one binding will be changed */
FLUSH_VERTICES(ctx, 0, 0);
- ctx->NewDriverState |= ctx->DriverFlags.NewShaderStorageBuffer;
+ ctx->NewDriverState |= ST_NEW_STORAGE_BUFFER;
if (!buffers) {
/* The ARB_multi_bind spec says:
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index d7a20c66731..566cbe9527d 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -4768,24 +4768,11 @@ struct gl_dlist_state
*/
struct gl_driver_flags
{
- /**
- * gl_context::ShaderStorageBufferBindings
- * gl_shader_program::ShaderStorageBlocks
- */
- uint64_t NewShaderStorageBuffer;
-
- uint64_t NewTextureBuffer;
-
/**
* gl_context::AtomicBufferBindings
*/
uint64_t NewAtomicBuffer;
- /**
- * gl_context::ImageUnits
- */
- uint64_t NewImageUnits;
-
/**
* gl_context::Scissor::WindowRects
*/
diff --git a/src/mesa/main/shaderimage.c b/src/mesa/main/shaderimage.c
index a4acd3daccc..3067a9af9aa 100644
--- a/src/mesa/main/shaderimage.c
+++ b/src/mesa/main/shaderimage.c
@@ -37,6 +37,8 @@
#include "enums.h"
#include "api_exec_decl.h"
+#include "state_tracker/st_context.h"
+
mesa_format
_mesa_get_shader_image_format(GLenum format)
{
@@ -590,7 +592,7 @@ bind_image_texture(struct gl_context *ctx, struct gl_texture_object *texObj,
u = &ctx->ImageUnits[unit];
FLUSH_VERTICES(ctx, 0, 0);
- ctx->NewDriverState |= ctx->DriverFlags.NewImageUnits;
+ ctx->NewDriverState |= ST_NEW_IMAGE_UNITS;
set_image_binding(u, texObj, level, layered, layer, access, format);
}
@@ -688,7 +690,7 @@ bind_image_textures(struct gl_context *ctx, GLuint first, GLuint count,
/* Assume that at least one binding will be changed */
FLUSH_VERTICES(ctx, 0, 0);
- ctx->NewDriverState |= ctx->DriverFlags.NewImageUnits;
+ ctx->NewDriverState |= ST_NEW_IMAGE_UNITS;
/* Note that the error semantics for multi-bind commands differ from
* those of other GL commands.
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 2d0f6d4fc57..0adb80c6a07 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -59,6 +59,7 @@
#include "api_exec_decl.h"
#include "state_tracker/st_cb_texture.h"
+#include "state_tracker/st_context.h"
#include "state_tracker/st_format.h"
#include "state_tracker/st_gen_mipmap.h"
#include "state_tracker/st_cb_eglimage.h"
@@ -6360,7 +6361,7 @@ texture_buffer_range(struct gl_context *ctx,
}
}
- ctx->NewDriverState |= ctx->DriverFlags.NewTextureBuffer;
+ ctx->NewDriverState |= ST_NEW_SAMPLER_VIEWS;
if (bufObj) {
bufObj->UsageHistory |= USAGE_TEXTURE_BUFFER;
diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
index 36faccf4257..86e25c8861d 100644
--- a/src/mesa/main/uniform_query.cpp
+++ b/src/mesa/main/uniform_query.cpp
@@ -39,6 +39,7 @@
#include "compiler/glsl/program.h"
#include "util/bitscan.h"
+#include "state_tracker/st_context.h"
/* This is one of the few glGet that can be called from the app thread safely.
* Only these conditions must be met:
@@ -1613,7 +1614,7 @@ _mesa_uniform(GLint location, GLsizei count, const GLvoid *values,
}
}
- ctx->NewDriverState |= ctx->DriverFlags.NewImageUnits;
+ ctx->NewDriverState |= ST_NEW_IMAGE_UNITS;
}
}
diff --git a/src/mesa/main/uniforms.c b/src/mesa/main/uniforms.c
index 365eaf25d0c..6bb8727ee51 100644
--- a/src/mesa/main/uniforms.c
+++ b/src/mesa/main/uniforms.c
@@ -1173,7 +1173,7 @@ shader_storage_block_binding(struct gl_context *ctx,
shaderStorageBlockBinding) {
FLUSH_VERTICES(ctx, 0, 0);
- ctx->NewDriverState |= ctx->DriverFlags.NewShaderStorageBuffer;
+ ctx->NewDriverState |= ST_NEW_STORAGE_BUFFER;
shProg->data->ShaderStorageBlocks[shaderStorageBlockIndex].Binding =
shaderStorageBlockBinding;
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index f9ede366702..b77dd901246 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -448,13 +448,10 @@ st_init_driver_flags(struct st_context *st)
struct gl_driver_flags *f = &st->ctx->DriverFlags;
/* Shader resources */
- f->NewTextureBuffer = ST_NEW_SAMPLER_VIEWS;
if (st->has_hw_atomics)
f->NewAtomicBuffer = ST_NEW_HW_ATOMICS | ST_NEW_CS_ATOMICS;
else
f->NewAtomicBuffer = ST_NEW_ATOMIC_BUFFER;
- f->NewShaderStorageBuffer = ST_NEW_STORAGE_BUFFER;
- f->NewImageUnits = ST_NEW_IMAGE_UNITS;
f->NewShaderConstants[MESA_SHADER_VERTEX] = ST_NEW_VS_CONSTANTS;
f->NewShaderConstants[MESA_SHADER_TESS_CTRL] = ST_NEW_TCS_CONSTANTS;
More information about the mesa-commit
mailing list