KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa/st: drop new framebuffer srgb driver state bit 

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 13:08:16 +10:00 committed by Marge Bot
parent cbaf072971
commit ddade693d0
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/main/enable.c
View File

@ -377,9 +377,9 @@ _mesa_set_framebuffer_srgb(struct gl_context *ctx, GLboolean state)
return;
/* TODO: Switch i965 to the new flag and remove the conditional */
FLUSH_VERTICES(ctx, ctx->DriverFlags.NewFramebufferSRGB ? 0 : _NEW_BUFFERS,
FLUSH_VERTICES(ctx, 0,
GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT);
ctx->NewDriverState |= ctx->DriverFlags.NewFramebufferSRGB;
ctx->NewDriverState |= ST_NEW_FB_STATE;
ctx->Color.sRGBEnabled = state;
st_Enable(ctx, GL_FRAMEBUFFER_SRGB);

3
src/mesa/main/mtypes.h
View File

@ -4773,9 +4773,6 @@ struct gl_driver_flags
*/
uint64_t NewAtomicBuffer;
/** gl_context::Color::sRGBEnabled */
uint64_t NewFramebufferSRGB;
/** gl_context::Color::Alpha* */
uint64_t NewAlphaTest;

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

@ -460,8 +460,6 @@ st_init_driver_flags(struct st_context *st)
f->NewShaderConstants[MESA_SHADER_FRAGMENT] = ST_NEW_FS_CONSTANTS;
f->NewShaderConstants[MESA_SHADER_COMPUTE] = ST_NEW_CS_CONSTANTS;
f->NewFramebufferSRGB = ST_NEW_FB_STATE;
if (st->lower_alpha_test)
f->NewAlphaTest = ST_NEW_FS_STATE | ST_NEW_FS_CONSTANTS;
else