fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-06 10:38:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

radeonsi: remove always-set SI_SAVE_FRAGMENT_STATE

Browse source 
Reviewed-by: Pierre-Eric
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40634>
This commit is contained in:
Marek Olšák 2026-03-25 13:27:16 -04:00 • committed by Marge Bot
parent 2dc65308f8
commit 7f846bc50a
3 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/gallium/drivers/radeonsi/si_blit.c
View file

@ -14,12 +14,9 @@
enum
{
SI_COPY =
SI_SAVE_FRAMEBUFFER | SI_SAVE_TEXTURES | SI_SAVE_FRAGMENT_STATE | SI_DISABLE_RENDER_COND,
SI_BLIT = SI_SAVE_FRAMEBUFFER | SI_SAVE_TEXTURES | SI_SAVE_FRAGMENT_STATE,
SI_DECOMPRESS = SI_SAVE_FRAMEBUFFER | SI_SAVE_FRAGMENT_STATE | SI_DISABLE_RENDER_COND,
SI_COPY = SI_SAVE_FRAMEBUFFER | SI_SAVE_TEXTURES | SI_DISABLE_RENDER_COND,
SI_BLIT = SI_SAVE_FRAMEBUFFER | SI_SAVE_TEXTURES,
SI_DECOMPRESS = SI_SAVE_FRAMEBUFFER | SI_DISABLE_RENDER_COND,
};
void si_blitter_begin(struct si_context *sctx, enum si_blitter_op op)
@ -38,23 +35,21 @@ void si_blitter_begin(struct si_context *sctx, enum si_blitter_op op)
util_blitter_save_viewport(sctx->blitter, &sctx->viewports.states[0]);
util_blitter_save_rasterizer(sctx->blitter, sctx->queued.named.rasterizer);
if (op & SI_SAVE_FRAGMENT_STATE) {
struct pipe_constant_buffer fs_cb = {};
si_get_pipe_constant_buffer(sctx, MESA_SHADER_FRAGMENT, 0, &fs_cb);
struct pipe_constant_buffer fs_cb = {};
si_get_pipe_constant_buffer(sctx, MESA_SHADER_FRAGMENT, 0, &fs_cb);
if (op & SI_SAVE_FRAGMENT_CONSTANT)
util_blitter_save_fragment_constant_buffer_slot(sctx->blitter, &fs_cb);
if (op & SI_SAVE_FRAGMENT_CONSTANT)
util_blitter_save_fragment_constant_buffer_slot(sctx->blitter, &fs_cb);
pipe_resource_reference(&fs_cb.buffer, NULL);
util_blitter_save_blend(sctx->blitter, sctx->queued.named.blend);
util_blitter_save_depth_stencil_alpha(sctx->blitter, sctx->queued.named.dsa);
util_blitter_save_stencil_ref(sctx->blitter, &sctx->stencil_ref.state);
util_blitter_save_fragment_shader(sctx->blitter, sctx->shader.ps.cso);
util_blitter_save_sample_mask(sctx->blitter, sctx->sample_mask, sctx->ps_iter_samples);
util_blitter_save_scissor(sctx->blitter, &sctx->scissors[0]);
util_blitter_save_window_rectangles(sctx->blitter, sctx->window_rectangles_include,
sctx->num_window_rectangles, sctx->window_rectangles);
}
pipe_resource_reference(&fs_cb.buffer, NULL);
util_blitter_save_blend(sctx->blitter, sctx->queued.named.blend);
util_blitter_save_depth_stencil_alpha(sctx->blitter, sctx->queued.named.dsa);
util_blitter_save_stencil_ref(sctx->blitter, &sctx->stencil_ref.state);
util_blitter_save_fragment_shader(sctx->blitter, sctx->shader.ps.cso);
util_blitter_save_sample_mask(sctx->blitter, sctx->sample_mask, sctx->ps_iter_samples);
util_blitter_save_scissor(sctx->blitter, &sctx->scissors[0]);
util_blitter_save_window_rectangles(sctx->blitter, sctx->window_rectangles_include,
sctx->num_window_rectangles, sctx->window_rectangles);
if (op & SI_SAVE_FRAMEBUFFER)
util_blitter_save_framebuffer(sctx->blitter, &sctx->framebuffer.state);

6
src/gallium/drivers/radeonsi/si_clear.c
View file

@ -12,9 +12,9 @@
#include "ac_formats.h"
enum {
SI_CLEAR = SI_SAVE_FRAGMENT_STATE | SI_SAVE_FRAGMENT_CONSTANT,
SI_CLEAR_SURFACE = SI_SAVE_FRAMEBUFFER | SI_SAVE_FRAGMENT_STATE | SI_SAVE_FRAGMENT_CONSTANT,
SI_DEPTH_STENCIL = SI_SAVE_FRAMEBUFFER | SI_SAVE_FRAGMENT_STATE,
SI_CLEAR = SI_SAVE_FRAGMENT_CONSTANT,
SI_CLEAR_SURFACE = SI_SAVE_FRAMEBUFFER | SI_SAVE_FRAGMENT_CONSTANT,
SI_DEPTH_STENCIL = SI_SAVE_FRAMEBUFFER,
};
void si_init_buffer_clear(struct si_clear_info *info,

5
src/gallium/drivers/radeonsi/si_pipe.h
View file

@ -1383,9 +1383,8 @@ enum si_blitter_op /* bitmask */
{
SI_SAVE_TEXTURES = 1,
SI_SAVE_FRAMEBUFFER = 2,
SI_SAVE_FRAGMENT_STATE = 4,
SI_SAVE_FRAGMENT_CONSTANT = 8,
SI_DISABLE_RENDER_COND = 16,
SI_SAVE_FRAGMENT_CONSTANT = 4,
SI_DISABLE_RENDER_COND = 8,
};
void si_blitter_begin(struct si_context *sctx, enum si_blitter_op op);