OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv/llvm: stop assigning driver_location in NIR->LLVM

Browse Source 
It's already assigned just after NIR linking shaders.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7010>
This commit is contained in:
Samuel Pitoiset
2020-10-05 15:36:27 +02:00
parent 181d5f59b8
commit 0a90dab6b4
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/amd/llvm/ac_nir_to_llvm.c
View File

@@ -4687,7 +4687,7 @@ void ac_handle_shader_output_decl(struct ac_llvm_context *ctx, struct ac_shader_
struct nir_shader *nir, struct nir_variable *variable, struct nir_shader *nir, struct nir_variable *variable,
gl_shader_stage stage) gl_shader_stage stage)
{ {
unsigned output_loc = variable->data.driver_location / 4; unsigned output_loc = variable->data.driver_location;
unsigned attrib_count = glsl_count_attribute_slots(variable->type, false); unsigned attrib_count = glsl_count_attribute_slots(variable->type, false);
/* tess ctrl has it's own load/store paths for outputs */ /* tess ctrl has it's own load/store paths for outputs */

2
src/amd/vulkan/radv_nir_to_llvm.c
View File

@@ -1338,8 +1338,6 @@ scan_shader_output_decl(struct radv_shader_context *ctx,
unsigned attrib_count = glsl_count_attribute_slots(variable->type, false); unsigned attrib_count = glsl_count_attribute_slots(variable->type, false);
uint64_t mask_attribs; uint64_t mask_attribs;
variable->data.driver_location = idx * 4;
/* tess ctrl has it's own load/store paths for outputs */ /* tess ctrl has it's own load/store paths for outputs */
if (stage == MESA_SHADER_TESS_CTRL) if (stage == MESA_SHADER_TESS_CTRL)
return; return;