Commit a808ba59 authored by Kenneth Graunke's avatar Kenneth Graunke

i965: Rework passthrough TCS checks.

According to Timothy, using program_string_id == 0 to identify the
passthrough TCS is going to be problematic for his shader cache work.

So, change it to strcmp() the name at visitor creation time.
Signed-off-by: Kenneth Graunke's avatarKenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner's avatarMatt Turner <mattst88@gmail.com>
parent ff8c0c9a
......@@ -2164,7 +2164,7 @@ fs_visitor::nir_emit_tcs_intrinsic(const fs_builder &bld,
if (indirect_offset.file != BAD_FILE) {
srcs[header_regs++] = indirect_offset;
} else if (tcs_key->program_string_id != 0) {
} else if (!is_passthrough_shader) {
if (imm_offset == 0) {
value.type = BRW_REGISTER_TYPE_F;
......
......@@ -646,6 +646,8 @@ backend_shader::backend_shader(const struct brw_compiler *compiler,
debug_enabled = INTEL_DEBUG & intel_debug_flag_for_shader_stage(stage);
stage_name = _mesa_shader_stage_to_string(stage);
stage_abbrev = _mesa_shader_stage_to_abbrev(stage);
is_passthrough_shader =
nir->info.name && strcmp(nir->info.name, "passthrough") == 0;
}
bool
......
......@@ -208,6 +208,7 @@ public:
bool debug_enabled;
const char *stage_name;
const char *stage_abbrev;
bool is_passthrough_shader;
brw::simple_allocator alloc;
......
......@@ -349,7 +349,7 @@ vec4_tcs_visitor::nir_emit_intrinsic(nir_intrinsic_instr *instr)
/* The passthrough shader writes the whole patch header as two vec4s;
* skip all the gl_TessLevelInner/Outer swizzling.
*/
if (indirect_offset.file == BAD_FILE && key->program_string_id != 0) {
if (indirect_offset.file == BAD_FILE && !is_passthrough_shader) {
if (imm_offset == 0) {
value.type = BRW_REGISTER_TYPE_F;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment