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

st/glsl_to_nir: generate NIR earlier

Browse Source 
We want to use nir_shader_gather_info() the GLSL IR version might
be including varyings that NIR later eliminates. To do this we
need to generate NIR before we we start using the in/out bitmasks.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Timothy Arceri
2017-11-01 17:28:09 +11:00
parent f6c0504abc
commit c980a3aa31
2 changed files with 14 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/state_tracker/st_glsl_to_nir.cpp
+6
View File
@@ -407,6 +407,7 @@ st_nir_get_mesa_program(struct gl_context *ctx,
struct gl_shader_program *shader_program, struct gl_shader_program *shader_program,
struct gl_linked_shader *shader) struct gl_linked_shader *shader)
{ {
struct st_context *st = st_context(ctx);
struct gl_program *prog; struct gl_program *prog;
validate_ir_tree(shader->ir); validate_ir_tree(shader->ir);
@@ -462,6 +463,11 @@ st_nir_get_mesa_program(struct gl_context *ctx,
return NULL; return NULL;
} }
struct st_common_program *st_comm_prog = (struct st_common_program *)prog;
nir_shader *nir = st_glsl_to_nir(st, prog, shader_program, shader->Stage);
st_comm_prog->tgsi.type = PIPE_SHADER_IR_NIR;
st_comm_prog->tgsi.ir.nir = nir;
return prog; return prog;
} }
src/mesa/state_tracker/st_program.c
+8 -37
View File
@@ -447,12 +447,6 @@ st_translate_vertex_program(struct st_context *st,
} }
if (stvp->shader_program) { if (stvp->shader_program) {
nir_shader *nir = st_glsl_to_nir(st, &stvp->Base, stvp->shader_program,
MESA_SHADER_VERTEX);
stvp->tgsi.type = PIPE_SHADER_IR_NIR;
stvp->tgsi.ir.nir = nir;
struct gl_program *prog = stvp->shader_program->last_vert_prog; struct gl_program *prog = stvp->shader_program->last_vert_prog;
if (prog) { if (prog) {
st_translate_stream_output_info2(prog->sh.LinkedTransformFeedback, st_translate_stream_output_info2(prog->sh.LinkedTransformFeedback,
@@ -895,15 +889,9 @@ st_translate_fragment_program(struct st_context *st,
} }
} }
if (stfp->shader_program) { /* We have already compiler to NIR so just return */
nir_shader *nir = st_glsl_to_nir(st, &stfp->Base, stfp->shader_program, if (stfp->shader_program)
MESA_SHADER_FRAGMENT);
stfp->tgsi.type = PIPE_SHADER_IR_NIR;
stfp->tgsi.ir.nir = nir;
return true; return true;
}
ureg = ureg_create_with_screen(PIPE_SHADER_FRAGMENT, st->pipe->screen); ureg = ureg_create_with_screen(PIPE_SHADER_FRAGMENT, st->pipe->screen);
if (ureg == NULL) if (ureg == NULL)
@@ -1681,15 +1669,9 @@ st_translate_tessctrl_program(struct st_context *st,
{ {
struct ureg_program *ureg; struct ureg_program *ureg;
if (sttcp->shader_program) { /* We have already compiler to NIR so just return */
nir_shader *nir = st_glsl_to_nir(st, &sttcp->Base, sttcp->shader_program, if (sttcp->shader_program)
MESA_SHADER_TESS_EVAL);
sttcp->tgsi.type = PIPE_SHADER_IR_NIR;
sttcp->tgsi.ir.nir = nir;
return true; return true;
}
ureg = ureg_create_with_screen(PIPE_SHADER_TESS_CTRL, st->pipe->screen); ureg = ureg_create_with_screen(PIPE_SHADER_TESS_CTRL, st->pipe->screen);
if (ureg == NULL) if (ureg == NULL)
@@ -1716,15 +1698,9 @@ st_translate_tesseval_program(struct st_context *st,
{ {
struct ureg_program *ureg; struct ureg_program *ureg;
if (sttep->shader_program) { /* We have already compiler to NIR so just return */
nir_shader *nir = st_glsl_to_nir(st, &sttep->Base, sttep->shader_program, if (sttep->shader_program)
MESA_SHADER_TESS_EVAL);
sttep->tgsi.type = PIPE_SHADER_IR_NIR;
sttep->tgsi.ir.nir = nir;
return true; return true;
}
ureg = ureg_create_with_screen(PIPE_SHADER_TESS_EVAL, st->pipe->screen); ureg = ureg_create_with_screen(PIPE_SHADER_TESS_EVAL, st->pipe->screen);
if (ureg == NULL) if (ureg == NULL)
@@ -1770,14 +1746,9 @@ st_translate_compute_program(struct st_context *st,
struct pipe_shader_state prog; struct pipe_shader_state prog;
if (stcp->shader_program) { if (stcp->shader_program) {
nir_shader *nir = st_glsl_to_nir(st, &stcp->Base, stcp->shader_program,
MESA_SHADER_COMPUTE);
/* no compute variants: */ /* no compute variants: */
st_finalize_nir(st, &stcp->Base, stcp->shader_program, nir); st_finalize_nir(st, &stcp->Base, stcp->shader_program,
(struct nir_shader *) stcp->tgsi.prog);
stcp->tgsi.ir_type = PIPE_SHADER_IR_NIR;
stcp->tgsi.prog = nir;
return true; return true;
} }