OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/st: use pipe_shader_from_nir

Browse Source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26272>
This commit is contained in:
Alyssa Rosenzweig
2023-11-19 12:30:27 -04:00
committed by Marge Bot
parent 0abf4af443
commit 76b751c3b1
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mesa/state_tracker/st_program.c
View File

@@ -35,6 +35,7 @@
#include "main/hash.h"
#include "main/mtypes.h"
#include "nir/pipe_nir.h"
#include "program/prog_parameter.h"
#include "program/prog_print.h"
#include "program/prog_to_nir.h"
@@ -496,7 +497,6 @@ st_create_nir_shader(struct st_context *st, struct pipe_shader_state *state)
assert(state->type == PIPE_SHADER_IR_NIR);
nir_shader *nir = state->ir.nir;
struct shader_info info = nir->info;
gl_shader_stage stage = nir->info.stage;
if (ST_DEBUG & DEBUG_PRINT_IR) {
@@ -522,12 +522,10 @@ st_create_nir_shader(struct st_context *st, struct pipe_shader_state *state)
shader = pipe->create_fs_state(pipe, state);
break;
case MESA_SHADER_COMPUTE: {
struct pipe_compute_state cs = {0};
cs.ir_type = state->type;
cs.static_shared_mem = info.shared_size;
cs.prog = state->ir.nir;
shader = pipe->create_compute_state(pipe, &cs);
/* We'd like to use this for all stages but we need to rework streamout in
* gallium first.
*/
shader = pipe_shader_from_nir(pipe, nir);
break;
}
default: