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

v3d: use pipe_shader_from_nir

Browse Source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26272>
This commit is contained in:
Alyssa Rosenzweig
2023-11-18 22:11:52 -04:00
committed by Marge Bot
parent dfa60b70e6
commit f205406264
1 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/gallium/drivers/v3d/v3d_blit.c
View File

@@ -21,6 +21,7 @@
* IN THE SOFTWARE.
*/
#include "nir/pipe_nir.h"
#include "util/format/u_format.h"
#include "util/u_surface.h"
#include "util/u_blitter.h"
@@ -476,12 +477,7 @@ v3d_get_sand8_vs(struct pipe_context *pctx)
pos_out->data.location = VARYING_SLOT_POS;
nir_store_var(&b, pos_out, nir_load_var(&b, pos_in), 0xf);
struct pipe_shader_state shader_tmpl = {
.type = PIPE_SHADER_IR_NIR,
.ir.nir = b.shader,
};
v3d->sand8_blit_vs = pctx->create_vs_state(pctx, &shader_tmpl);
v3d->sand8_blit_vs = pipe_shader_from_nir(pctx, b.shader);
return v3d->sand8_blit_vs;
}
@@ -621,12 +617,8 @@ v3d_get_sand8_fs(struct pipe_context *pctx, int cpp)
output,
0xF);
struct pipe_shader_state shader_tmpl = {
.type = PIPE_SHADER_IR_NIR,
.ir.nir = b.shader,
};
*cached_shader = pctx->create_fs_state(pctx, &shader_tmpl);
*cached_shader = pipe_shader_from_nir(pctx, b.shader);
return *cached_shader;
}
@@ -769,12 +761,7 @@ v3d_get_sand30_vs(struct pipe_context *pctx)
pos_out->data.location = VARYING_SLOT_POS;
nir_store_var(&b, pos_out, nir_load_var(&b, pos_in), 0xf);
struct pipe_shader_state shader_tmpl = {
.type = PIPE_SHADER_IR_NIR,
.ir.nir = b.shader,
};
v3d->sand30_blit_vs = pctx->create_vs_state(pctx, &shader_tmpl);
v3d->sand30_blit_vs = pipe_shader_from_nir(pctx, b.shader);
return v3d->sand30_blit_vs;
}
@@ -948,12 +935,8 @@ v3d_get_sand30_fs(struct pipe_context *pctx)
nir_store_var(&b, color_out,
output,
0xf);
struct pipe_shader_state shader_tmpl = {
.type = PIPE_SHADER_IR_NIR,
.ir.nir = b.shader,
};
v3d->sand30_blit_fs = pctx->create_fs_state(pctx, &shader_tmpl);
v3d->sand30_blit_fs = pipe_shader_from_nir(pctx, b.shader);
return v3d->sand30_blit_fs;
}