fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 20:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa/st: drop new uniform driver state bit

Browse source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14261>
This commit is contained in:
Dave Airlie 2021-12-20 12:47:12 +10:00 • committed by Marge Bot
parent f35d22b2ee
commit 6e15cc69ec
4 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/main/bufferobj.c
View file

@ -1699,7 +1699,7 @@ bind_uniform_buffer(struct gl_context *ctx,
{
bind_buffer(ctx, &ctx->UniformBufferBindings[index],
bufObj, offset, size, autoSize,
ctx->DriverFlags.NewUniformBuffer,
ST_NEW_UNIFORM_BUFFER,
USAGE_UNIFORM_BUFFER);
}
@ -4399,7 +4399,7 @@ bind_uniform_buffers(struct gl_context *ctx, GLuint first, GLsizei count,
/* Assume that at least one binding will be changed */
FLUSH_VERTICES(ctx, 0, 0);
ctx->NewDriverState |= ctx->DriverFlags.NewUniformBuffer;
ctx->NewDriverState |= ST_NEW_UNIFORM_BUFFER;
if (!buffers) {
/* The ARB_multi_bind spec says:

6
src/mesa/main/mtypes.h
View file

@ -4774,12 +4774,6 @@ struct gl_driver_flags
/** gl_context::TransformFeedback::CurrentObject::shader_program */
uint64_t NewTransformFeedbackProg;
/**
* gl_context::UniformBufferBindings
* gl_shader_program::UniformBlocks
*/
uint64_t NewUniformBuffer;
/**
* gl_context::ShaderStorageBufferBindings
* gl_shader_program::ShaderStorageBlocks

4
src/mesa/main/uniforms.c
View file

@ -48,6 +48,8 @@
#include "util/bitscan.h"
#include "api_exec_decl.h"
#include "state_tracker/st_context.h"
/**
* Update the vertex/fragment program's TexturesUsed array.
*
@ -1109,7 +1111,7 @@ uniform_block_binding(struct gl_context *ctx, struct gl_shader_program *shProg,
uniformBlockBinding) {
FLUSH_VERTICES(ctx, 0, 0);
ctx->NewDriverState |= ctx->DriverFlags.NewUniformBuffer;
ctx->NewDriverState |= ST_NEW_UNIFORM_BUFFER;
shProg->data->UniformBlocks[uniformBlockIndex].Binding =
uniformBlockBinding;

2
src/mesa/state_tracker/st_context.c
View file

@ -447,8 +447,6 @@ st_init_driver_flags(struct st_context *st)
{
struct gl_driver_flags *f = &st->ctx->DriverFlags;
f->NewUniformBuffer = ST_NEW_UNIFORM_BUFFER;
/* Shader resources */
f->NewTextureBuffer = ST_NEW_SAMPLER_VIEWS;
if (st->has_hw_atomics)