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

panfrost: Rename prepare_rsd->prepare_shader

Browse Source 
This hook will be repurposed on Valhall to prepare the Shader Program
Descriptor, which takes the role of the RSD. Rename to avoid confusion.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15204>
This commit is contained in:
Alyssa Rosenzweig
2021-11-18 23:37:41 -05:00
committed by Marge Bot
parent 631c01fc42
commit 28743a5556
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/panfrost/pan_assemble.c
+1 -1
View File
@@ -88,7 +88,7 @@ panfrost_shader_compile(struct pipe_screen *pscreen,
/* Don't upload RSD for fragment shaders since they need draw-time
* merging for e.g. depth/stencil/alpha */
bool upload = stage != MESA_SHADER_FRAGMENT;
screen->vtbl.prepare_rsd(state, desc_pool, upload);
screen->vtbl.prepare_shader(state, desc_pool, upload);
panfrost_analyze_sysvals(state);
src/gallium/drivers/panfrost/pan_cmdstream.c
+2 -2
View File
@@ -3623,7 +3623,7 @@ panfrost_create_blend_state(struct pipe_context *pipe,
}
static void
prepare_rsd(struct panfrost_shader_state *state,
prepare_shader(struct panfrost_shader_state *state,
struct panfrost_pool *pool, bool upload)
{
struct mali_renderer_state_packed *out =
@@ -3791,7 +3791,7 @@ GENX(panfrost_cmdstream_screen_init)(struct panfrost_screen *screen)
{
struct panfrost_device *dev = &screen->dev;
screen->vtbl.prepare_rsd = prepare_rsd;
screen->vtbl.prepare_shader = prepare_shader;
screen->vtbl.emit_tls = emit_tls;
screen->vtbl.emit_fbd = emit_fbd;
screen->vtbl.emit_fragment_job = emit_fragment_job;
src/gallium/drivers/panfrost/pan_screen.h
+3 -3
View File
@@ -51,9 +51,9 @@ struct pan_blend_state;
/* Virtual table of per-generation (GenXML) functions */
struct panfrost_vtable {
/* Prepares the renderer state descriptor for a given compiled shader,
* and if desired uploads it as well */
void (*prepare_rsd)(struct panfrost_shader_state *,
/* Prepares the renderer state descriptor or shader program descriptor
* for a given compiled shader, and if desired uploads it as well */
void (*prepare_shader)(struct panfrost_shader_state *,
struct panfrost_pool *, bool);
/* Emits a thread local storage descriptor */