From: Kenneth Graunke Date: Mon, 26 Nov 2018 22:58:54 +0000 (-0800) Subject: intel/compiler: Use nir's info when checking uses_streams. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f11780779ff8b9449e9fcb55a672f12ef81d7a1a;p=mesa.git intel/compiler: Use nir's info when checking uses_streams. Vulkan and Gallium don't use Mesa's gl_program data structure, so they can't poke at 'prog'. But we can simply use the copy of the shader info stored with the NIR shader, which is guaranteed to exist. Reviewed-by: Jason Ekstrand Reviewed-by: Iago Toral Quiroga --- diff --git a/src/intel/compiler/brw_vec4_gs_visitor.cpp b/src/intel/compiler/brw_vec4_gs_visitor.cpp index 63ff27e5e08..a6e38b0f379 100644 --- a/src/intel/compiler/brw_vec4_gs_visitor.cpp +++ b/src/intel/compiler/brw_vec4_gs_visitor.cpp @@ -667,7 +667,7 @@ brw_compile_gs(const struct brw_compiler *compiler, void *log_data, prog_data->control_data_format = GEN7_GS_CONTROL_DATA_FORMAT_GSCTL_SID; /* We only have to emit control bits if we are using streams */ - if (prog && prog->info.gs.uses_streams) + if (shader->info.gs.uses_streams) c.control_data_bits_per_vertex = 2; else c.control_data_bits_per_vertex = 0;