#include "brw_context.h"
#include "compiler/brw_nir.h"
#include "brw_program.h"
+#include "compiler/glsl/gl_nir.h"
+#include "compiler/glsl/gl_nir_linker.h"
#include "compiler/glsl/ir.h"
#include "compiler/glsl/ir_optimization.h"
#include "compiler/glsl/program.h"
+#include "compiler/nir/nir_serialize.h"
#include "program/program.h"
+#include "main/glspirv.h"
#include "main/mtypes.h"
#include "main/shaderapi.h"
#include "main/shaderobj.h"
ralloc_adopt(mem_ctx, shader->ir);
- lower_blend_equation_advanced(shader);
+ lower_blend_equation_advanced(
+ shader, ctx->Extensions.KHR_blend_equation_advanced_coherent);
/* lower_packing_builtins() inserts arithmetic instructions, so it
* must precede lower_instructions().
}
static void
-update_xfb_info(struct gl_transform_feedback_info *xfb_info)
+update_xfb_info(struct gl_transform_feedback_info *xfb_info,
+ struct shader_info *info)
{
if (!xfb_info)
return;
output->ComponentOffset = 3;
break;
}
+
+ info->outputs_written |= 1ull << output->OutputRegister;
}
}
unsigned int stage;
struct shader_info *infos[MESA_SHADER_STAGES] = { 0, };
+ if (shProg->data->LinkStatus == LINKING_SKIPPED)
+ return GL_TRUE;
+
for (stage = 0; stage < ARRAY_SIZE(shProg->_LinkedShaders); stage++) {
struct gl_linked_shader *shader = shProg->_LinkedShaders[stage];
if (!shader)
struct gl_program *prog = shader->Program;
prog->Parameters = _mesa_new_parameter_list();
- process_glsl_ir(brw, shProg, shader);
+ if (!shader->spirv_data)
+ process_glsl_ir(brw, shProg, shader);
_mesa_copy_linked_program_data(shProg, shader);
prog->ShadowSamplers = shader->shadow_samplers;
- _mesa_update_shader_textures_used(shProg, prog);
-
- update_xfb_info(prog->sh.LinkedTransformFeedback);
bool debug_enabled =
(INTEL_DEBUG & intel_debug_flag_for_shader_stage(shader->Stage));
prog->nir = brw_create_nir(brw, shProg, prog, (gl_shader_stage) stage,
compiler->scalar_stage[stage]);
+ }
+
+ /* SPIR-V programs use a NIR linker */
+ if (shProg->data->spirv) {
+ if (!gl_nir_link_uniforms(ctx, shProg))
+ return false;
+
+ gl_nir_link_assign_atomic_counter_resources(ctx, shProg);
+ gl_nir_link_assign_xfb_resources(ctx, shProg);
+ }
+
+ for (stage = 0; stage < ARRAY_SIZE(shProg->_LinkedShaders); stage++) {
+ struct gl_linked_shader *shader = shProg->_LinkedShaders[stage];
+ if (!shader)
+ continue;
+
+ struct gl_program *prog = shader->Program;
+
+ NIR_PASS_V(prog->nir, brw_nir_lower_gl_images, prog);
+ }
+
+ /* Determine first and last stage. */
+ unsigned first = MESA_SHADER_STAGES;
+ unsigned last = 0;
+ for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {
+ if (!shProg->_LinkedShaders[i])
+ continue;
+ if (first == MESA_SHADER_STAGES)
+ first = i;
+ last = i;
+ }
+
+ /* Linking the stages in the opposite order (from fragment to vertex)
+ * ensures that inter-shader outputs written to in an earlier stage
+ * are eliminated if they are (transitively) not used in a later
+ * stage.
+ *
+ * TODO: Look into Shadow of Mordor regressions on HSW and enable this for
+ * all platforms. See: https://bugs.freedesktop.org/show_bug.cgi?id=103537
+ */
+ if (first != last && brw->screen->devinfo.gen >= 8) {
+ int next = last;
+ for (int i = next - 1; i >= 0; i--) {
+ if (shProg->_LinkedShaders[i] == NULL)
+ continue;
+
+ brw_nir_link_shaders(compiler,
+ &shProg->_LinkedShaders[i]->Program->nir,
+ &shProg->_LinkedShaders[next]->Program->nir);
+ next = i;
+ }
+ }
+
+ for (stage = 0; stage < ARRAY_SIZE(shProg->_LinkedShaders); stage++) {
+ struct gl_linked_shader *shader = shProg->_LinkedShaders[stage];
+ if (!shader)
+ continue;
+
+ struct gl_program *prog = shader->Program;
+
+ _mesa_update_shader_textures_used(shProg, prog);
+
+ brw_shader_gather_info(prog->nir, prog);
+
+ NIR_PASS_V(prog->nir, gl_nir_lower_samplers, shProg);
+ prog->info.textures_used = prog->nir->info.textures_used;
+ prog->info.textures_used_by_txf = prog->nir->info.textures_used_by_txf;
+ NIR_PASS_V(prog->nir, gl_nir_lower_atomics, shProg, false);
+ NIR_PASS_V(prog->nir, nir_lower_atomics_to_ssbo,
+ prog->nir->info.num_abos);
+
+ nir_sweep(prog->nir);
+
infos[stage] = &prog->nir->info;
+ update_xfb_info(prog->sh.LinkedTransformFeedback, infos[stage]);
+
/* Make a pass over the IR to add state references for any built-in
* uniforms that are used. This has to be done now (during linking).
* Code generation doesn't happen until the first time this shader is
* get sent to the shader.
*/
nir_foreach_variable(var, &prog->nir->uniforms) {
- if (strncmp(var->name, "gl_", 3) == 0) {
- const nir_state_slot *const slots = var->state_slots;
- assert(var->state_slots != NULL);
-
- for (unsigned int i = 0; i < var->num_state_slots; i++) {
- _mesa_add_state_reference(prog->Parameters,
- (gl_state_index *)slots[i].tokens);
- }
+ const nir_state_slot *const slots = var->state_slots;
+ for (unsigned int i = 0; i < var->num_state_slots; i++) {
+ assert(slots != NULL);
+ _mesa_add_state_reference(prog->Parameters, slots[i].tokens);
}
}
}
if (brw->precompile && !brw_shader_precompile(ctx, shProg))
return false;
- build_program_resource_list(ctx, shProg);
+ /* SPIR-V programs build its resource list from linked NIR shaders. */
+ if (!shProg->data->spirv)
+ build_program_resource_list(ctx, shProg);
+ else
+ nir_build_program_resource_list(ctx, shProg);
for (stage = 0; stage < ARRAY_SIZE(shProg->_LinkedShaders); stage++) {
struct gl_linked_shader *shader = shProg->_LinkedShaders[stage];
projects / mesa.git / blobdiff