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

mesa/st: Extract preprocessing NIR steps 

Refactor to split the glsl_to_nir conversion from the preprocessing
NIR passes into separate functions, so we can use them in SPIR-V.
Unlike in GLSL, there we'll need to perform a few passes with the NIR
linker before doing the individual preprocess calls.

No behavior should change with this patch.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
This commit is contained in:
Caio Marcelo de Oliveira Filho 2019-08-22 07:10:32 -07:00
parent b6384e57f5
commit 18e79e97e5
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/mesa/state_tracker/st_glsl_to_nir.cpp
View File

@ -269,10 +269,10 @@ st_nir_opts(nir_shader *nir, bool scalar)
* nir_lower_io state, so that shader variants can more easily insert/
* replace variables, etc.
*/
static nir_shader *
st_glsl_to_nir(struct st_context *st, struct gl_program *prog,
struct gl_shader_program *shader_program,
gl_shader_stage stage)
static void
st_nir_preprocess(struct st_context *st, struct gl_program *prog,
struct gl_shader_program *shader_program,
gl_shader_stage stage)
{
const nir_shader_compiler_options *options =
st->ctx->Const.ShaderCompilerOptions[prog->info.stage].NirOptions;
@ -282,11 +282,7 @@ st_glsl_to_nir(struct st_context *st, struct gl_program *prog,
assert(options);
bool lower_64bit =
options->lower_int64_options || options->lower_doubles_options;
if (prog->nir)
return prog->nir;
nir_shader *nir = glsl_to_nir(st->ctx, shader_program, stage, options);
nir_shader *nir = prog->nir;
/* Set the next shader stage hint for VS and TES. */
if (!nir->info.separate_shader &&
@ -355,8 +351,6 @@ st_glsl_to_nir(struct st_context *st, struct gl_program *prog,
if (lowered_64bit_ops)
st_nir_opts(nir, is_scalar);
}
return nir;
}
/* Second third of converting glsl_to_nir. This creates uniforms, gathers
@ -510,10 +504,17 @@ st_nir_get_mesa_program(struct gl_context *ctx,
prog->ExternalSamplersUsed = gl_external_samplers(prog);
_mesa_update_shader_textures_used(shader_program, prog);
nir_shader *nir = st_glsl_to_nir(st, prog, shader_program, shader->Stage);
if (!prog->nir) {
const nir_shader_compiler_options *options =
st->ctx->Const.ShaderCompilerOptions[prog->info.stage].NirOptions;
assert(options);
set_st_program(prog, shader_program, nir);
prog->nir = nir;
prog->nir = glsl_to_nir(st->ctx, shader_program,
prog->info.stage, options);
st_nir_preprocess(st, prog, shader_program, prog->info.stage);
}
set_st_program(prog, shader_program, prog->nir);
}
static void