#include "brw_context.h"
#include "brw_nir.h"
#include "brw_program.h"
-#include "brw_shader.h"
#include "brw_state.h"
#include "program/prog_parameter.h"
static void
-brw_tes_debug_recompile(struct brw_context *brw,
- struct gl_shader_program *shader_prog,
+brw_tes_debug_recompile(struct brw_context *brw, struct gl_program *prog,
const struct brw_tes_prog_key *key)
{
- struct brw_cache_item *c = NULL;
- const struct brw_tes_prog_key *old_key = NULL;
- bool found = false;
-
perf_debug("Recompiling tessellation evaluation shader for program %d\n",
- shader_prog->Name);
-
- for (unsigned int i = 0; i < brw->cache.size; i++) {
- for (c = brw->cache.items[i]; c; c = c->next) {
- if (c->cache_id == BRW_CACHE_TES_PROG) {
- old_key = c->key;
+ prog->Id);
- if (old_key->program_string_id == key->program_string_id)
- break;
- }
- }
- if (c)
- break;
- }
+ bool found = false;
+ const struct brw_tes_prog_key *old_key =
+ brw_find_previous_compile(&brw->cache, BRW_CACHE_TES_PROG,
+ key->program_string_id);
- if (!c) {
+ if (!old_key) {
perf_debug(" Didn't find previous compile in the shader cache for "
"debug\n");
return;
static bool
brw_codegen_tes_prog(struct brw_context *brw,
- struct gl_shader_program *shader_prog,
- struct brw_tess_eval_program *tep,
+ struct brw_program *tep,
struct brw_tes_prog_key *key)
{
const struct brw_compiler *compiler = brw->screen->compiler;
const struct gen_device_info *devinfo = &brw->screen->devinfo;
struct brw_stage_state *stage_state = &brw->tes.base;
- nir_shader *nir = tep->program.Base.nir;
+ nir_shader *nir = tep->program.nir;
struct brw_tes_prog_data prog_data;
bool start_busy = false;
double start_time = 0;
memset(&prog_data, 0, sizeof(prog_data));
- brw_assign_common_binding_table_offsets(MESA_SHADER_TESS_EVAL, devinfo,
- shader_prog, &tep->program.Base,
+ brw_assign_common_binding_table_offsets(devinfo, &tep->program,
&prog_data.base.base, 0);
- switch (tep->program.Spacing) {
- case GL_EQUAL:
- prog_data.partitioning = BRW_TESS_PARTITIONING_INTEGER;
- break;
- case GL_FRACTIONAL_ODD:
- prog_data.partitioning = BRW_TESS_PARTITIONING_ODD_FRACTIONAL;
- break;
- case GL_FRACTIONAL_EVEN:
- prog_data.partitioning = BRW_TESS_PARTITIONING_EVEN_FRACTIONAL;
- break;
- default:
- unreachable("invalid domain shader spacing");
- }
-
- switch (tep->program.PrimitiveMode) {
- case GL_QUADS:
- prog_data.domain = BRW_TESS_DOMAIN_QUAD;
- break;
- case GL_TRIANGLES:
- prog_data.domain = BRW_TESS_DOMAIN_TRI;
- break;
- case GL_ISOLINES:
- prog_data.domain = BRW_TESS_DOMAIN_ISOLINE;
- break;
- default:
- unreachable("invalid domain shader primitive mode");
- }
-
- if (tep->program.PointMode) {
- prog_data.output_topology = BRW_TESS_OUTPUT_TOPOLOGY_POINT;
- } else if (tep->program.PrimitiveMode == GL_ISOLINES) {
- prog_data.output_topology = BRW_TESS_OUTPUT_TOPOLOGY_LINE;
- } else {
- /* Hardware winding order is backwards from OpenGL */
- switch (tep->program.VertexOrder) {
- case GL_CCW:
- prog_data.output_topology = BRW_TESS_OUTPUT_TOPOLOGY_TRI_CW;
- break;
- case GL_CW:
- prog_data.output_topology = BRW_TESS_OUTPUT_TOPOLOGY_TRI_CCW;
- break;
- default:
- unreachable("invalid domain shader vertex order");
- }
- }
-
/* Allocate the references to the uniforms that will end up in the
* prog_data associated with the compiled program, and which will be freed
* by the state cache.
* padding around uniform values below vec4 size, so the worst case is that
* every uniform is a float which gets padded to the size of a vec4.
*/
- struct gl_linked_shader *tes =
- shader_prog->_LinkedShaders[MESA_SHADER_TESS_EVAL];
int param_count = nir->num_uniforms / 4;
prog_data.base.base.param =
prog_data.base.base.pull_param =
rzalloc_array(NULL, const gl_constant_value *, param_count);
prog_data.base.base.image_param =
- rzalloc_array(NULL, struct brw_image_param, tes->NumImages);
+ rzalloc_array(NULL, struct brw_image_param,
+ tep->program.info.num_images);
prog_data.base.base.nr_params = param_count;
- prog_data.base.base.nr_image_params = tes->NumImages;
+ prog_data.base.base.nr_image_params = tep->program.info.num_images;
- prog_data.base.cull_distance_mask =
- ((1 << tep->program.Base.CullDistanceArraySize) - 1) <<
- tep->program.Base.ClipDistanceArraySize;
-
- brw_nir_setup_glsl_uniforms(nir, shader_prog, &tep->program.Base,
- &prog_data.base.base,
+ brw_nir_setup_glsl_uniforms(nir, &tep->program, &prog_data.base.base,
compiler->scalar_stage[MESA_SHADER_TESS_EVAL]);
- if (unlikely(INTEL_DEBUG & DEBUG_TES))
- brw_dump_ir("tessellation evaluation", shader_prog, tes, NULL);
-
int st_index = -1;
if (unlikely(INTEL_DEBUG & DEBUG_SHADER_TIME))
- st_index = brw_get_shader_time_index(brw, shader_prog, NULL, ST_TES);
+ st_index = brw_get_shader_time_index(brw, &tep->program, ST_TES, true);
if (unlikely(brw->perf_debug)) {
start_busy = brw->batch.last_bo && drm_intel_bo_busy(brw->batch.last_bo);
start_time = get_time();
}
+ struct brw_vue_map input_vue_map;
+ brw_compute_tess_vue_map(&input_vue_map, key->inputs_read,
+ key->patch_inputs_read);
+
void *mem_ctx = ralloc_context(NULL);
unsigned program_size;
char *error_str;
const unsigned *program =
- brw_compile_tes(compiler, brw, mem_ctx, key, &prog_data, nir,
- shader_prog, st_index, &program_size, &error_str);
+ brw_compile_tes(compiler, brw, mem_ctx, key, &input_vue_map, &prog_data,
+ nir, &tep->program, st_index, &program_size, &error_str);
if (program == NULL) {
- if (shader_prog) {
- shader_prog->LinkStatus = false;
- ralloc_strcat(&shader_prog->InfoLog, error_str);
- }
+ tep->program.sh.data->LinkStatus = linking_failure;
+ ralloc_strcat(&tep->program.sh.data->InfoLog, error_str);
_mesa_problem(NULL, "Failed to compile tessellation evaluation shader: "
"%s\n", error_str);
}
if (unlikely(brw->perf_debug)) {
- struct brw_shader *btes = (struct brw_shader *) tes;
- if (btes->compiled_once) {
- brw_tes_debug_recompile(brw, shader_prog, key);
+ if (tep->compiled_once) {
+ brw_tes_debug_recompile(brw, &tep->program, key);
}
if (start_busy && !drm_intel_bo_busy(brw->batch.last_bo)) {
perf_debug("TES compile took %.03f ms and stalled the GPU\n",
(get_time() - start_time) * 1000);
}
- btes->compiled_once = true;
+ tep->compiled_once = true;
}
/* Scratch space is used for register spilling */
brw_alloc_stage_scratch(brw, stage_state,
prog_data.base.base.total_scratch,
- devinfo->max_ds_threads);
+ devinfo->max_tes_threads);
brw_upload_cache(&brw->cache, BRW_CACHE_TES_PROG,
key, sizeof(*key),
program, program_size,
&prog_data, sizeof(prog_data),
- &stage_state->prog_offset, &brw->tes.prog_data);
+ &stage_state->prog_offset, &brw->tes.base.prog_data);
ralloc_free(mem_ctx);
return true;
}
+void
+brw_tes_populate_key(struct brw_context *brw,
+ struct brw_tes_prog_key *key)
+{
+ struct brw_program *tcp = (struct brw_program *) brw->tess_ctrl_program;
+ struct brw_program *tep = (struct brw_program *) brw->tess_eval_program;
+ struct gl_program *prog = &tep->program;
+
+ uint64_t per_vertex_slots = prog->info.inputs_read;
+ uint32_t per_patch_slots = prog->info.patch_inputs_read;
+
+ memset(key, 0, sizeof(*key));
+
+ key->program_string_id = tep->id;
+
+ /* The TCS may have additional outputs which aren't read by the
+ * TES (possibly for cross-thread communication). These need to
+ * be stored in the Patch URB Entry as well.
+ */
+ if (tcp) {
+ struct gl_program *tcp_prog = &tcp->program;
+ per_vertex_slots |= tcp_prog->info.outputs_written &
+ ~(VARYING_BIT_TESS_LEVEL_INNER | VARYING_BIT_TESS_LEVEL_OUTER);
+ per_patch_slots |= tcp_prog->info.patch_outputs_written;
+ }
+
+ key->inputs_read = per_vertex_slots;
+ key->patch_inputs_read = per_patch_slots;
+
+ /* _NEW_TEXTURE */
+ brw_populate_sampler_prog_key_data(&brw->ctx, prog, &key->tex);
+}
void
-brw_upload_tes_prog(struct brw_context *brw,
- uint64_t per_vertex_slots,
- uint32_t per_patch_slots)
+brw_upload_tes_prog(struct brw_context *brw)
{
- struct gl_context *ctx = &brw->ctx;
- struct gl_shader_program **current = ctx->_Shader->CurrentProgram;
struct brw_stage_state *stage_state = &brw->tes.base;
struct brw_tes_prog_key key;
/* BRW_NEW_TESS_PROGRAMS */
- struct brw_tess_eval_program *tep =
- (struct brw_tess_eval_program *) brw->tess_eval_program;
+ struct brw_program *tep = (struct brw_program *) brw->tess_eval_program;
if (!brw_state_dirty(brw,
_NEW_TEXTURE,
BRW_NEW_TESS_PROGRAMS))
return;
- struct gl_program *prog = &tep->program.Base;
-
- memset(&key, 0, sizeof(key));
-
- key.program_string_id = tep->id;
-
- /* Ignore gl_TessLevelInner/Outer - we treat them as system values,
- * not inputs, and they're always present in the URB entry regardless
- * of whether or not we read them.
- */
- key.inputs_read = per_vertex_slots &
- ~(VARYING_BIT_TESS_LEVEL_INNER | VARYING_BIT_TESS_LEVEL_OUTER);
- key.patch_inputs_read = per_patch_slots;
-
- /* _NEW_TEXTURE */
- brw_populate_sampler_prog_key_data(ctx, prog, &key.tex);
+ brw_tes_populate_key(brw, &key);
if (!brw_search_cache(&brw->cache, BRW_CACHE_TES_PROG,
&key, sizeof(key),
- &stage_state->prog_offset, &brw->tes.prog_data)) {
- bool success = brw_codegen_tes_prog(brw, current[MESA_SHADER_TESS_EVAL],
- tep, &key);
+ &stage_state->prog_offset,
+ &brw->tes.base.prog_data)) {
+ bool success = brw_codegen_tes_prog(brw, tep, &key);
assert(success);
(void)success;
}
- brw->tes.base.prog_data = &brw->tes.prog_data->base.base;
}
struct brw_context *brw = brw_context(ctx);
struct brw_tes_prog_key key;
uint32_t old_prog_offset = brw->tes.base.prog_offset;
- struct brw_tes_prog_data *old_prog_data = brw->tes.prog_data;
+ struct brw_stage_prog_data *old_prog_data = brw->tes.base.prog_data;
bool success;
- struct gl_tess_eval_program *tep = (struct gl_tess_eval_program *)prog;
- struct brw_tess_eval_program *btep = brw_tess_eval_program(tep);
+ struct brw_program *btep = brw_program(prog);
memset(&key, 0, sizeof(key));
key.program_string_id = btep->id;
- key.inputs_read = prog->InputsRead;
- key.patch_inputs_read = prog->PatchInputsRead;
+ key.inputs_read = prog->nir->info->inputs_read;
+ key.patch_inputs_read = prog->nir->info->patch_inputs_read;
if (shader_prog->_LinkedShaders[MESA_SHADER_TESS_CTRL]) {
struct gl_program *tcp =
shader_prog->_LinkedShaders[MESA_SHADER_TESS_CTRL]->Program;
- key.inputs_read |= tcp->OutputsWritten;
- key.patch_inputs_read |= tcp->PatchOutputsWritten;
+ key.inputs_read |= tcp->nir->info->outputs_written &
+ ~(VARYING_BIT_TESS_LEVEL_INNER | VARYING_BIT_TESS_LEVEL_OUTER);
+ key.patch_inputs_read |= tcp->nir->info->patch_outputs_written;
}
- /* Ignore gl_TessLevelInner/Outer - they're system values. */
- key.inputs_read &= ~(VARYING_BIT_TESS_LEVEL_INNER |
- VARYING_BIT_TESS_LEVEL_OUTER);
-
brw_setup_tex_for_precompile(brw, &key.tex, prog);
- success = brw_codegen_tes_prog(brw, shader_prog, btep, &key);
+ success = brw_codegen_tes_prog(brw, btep, &key);
brw->tes.base.prog_offset = old_prog_offset;
- brw->tes.prog_data = old_prog_data;
+ brw->tes.base.prog_data = old_prog_data;
return success;
}
projects / mesa.git / blobdiff