KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radv/gfx10: Do not allocate a gs_copy_shader on gfx10. 

Will use ngg for any gs anyway.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Bas Nieuwenhuizen 2019-07-11 08:44:14 +02:00 committed by Samuel Pitoiset
parent ef5efb40f4
commit 45b73b3aa9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/amd/vulkan/radv_cmd_buffer.c
View File

@ -929,7 +929,8 @@ radv_emit_prefetch_L2(struct radv_cmd_buffer *cmd_buffer,
if (mask & RADV_PREFETCH_GS) { if (mask & RADV_PREFETCH_GS) {
radv_emit_shader_prefetch(cmd_buffer, radv_emit_shader_prefetch(cmd_buffer,
pipeline->shaders[MESA_SHADER_GEOMETRY]); pipeline->shaders[MESA_SHADER_GEOMETRY]);
radv_emit_shader_prefetch(cmd_buffer, pipeline->gs_copy_shader); if (pipeline->gs_copy_shader)
radv_emit_shader_prefetch(cmd_buffer, pipeline->gs_copy_shader);
} }
if (mask & RADV_PREFETCH_PS) if (mask & RADV_PREFETCH_PS)
@ -1123,7 +1124,7 @@ radv_emit_graphics_pipeline(struct radv_cmd_buffer *cmd_buffer)
pipeline->shaders[i]->bo); pipeline->shaders[i]->bo);
} }
if (radv_pipeline_has_gs(pipeline)) if (radv_pipeline_has_gs(pipeline) && pipeline->gs_copy_shader)
radv_cs_add_buffer(cmd_buffer->device->ws, cmd_buffer->cs, radv_cs_add_buffer(cmd_buffer->device->ws, cmd_buffer->cs,
pipeline->gs_copy_shader->bo); pipeline->gs_copy_shader->bo);

5
src/amd/vulkan/radv_pipeline.c
View File

@ -2392,6 +2392,7 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
struct radv_shader_binary *binaries[MESA_SHADER_STAGES] = {NULL}; struct radv_shader_binary *binaries[MESA_SHADER_STAGES] = {NULL};
struct radv_shader_variant_key keys[MESA_SHADER_STAGES] = {{{{{0}}}}}; struct radv_shader_variant_key keys[MESA_SHADER_STAGES] = {{{{{0}}}}};
unsigned char hash[20], gs_copy_hash[20]; unsigned char hash[20], gs_copy_hash[20];
bool use_ngg = device->physical_device->rad_info.chip_class >= GFX10;
radv_start_feedback(pipeline_feedback); radv_start_feedback(pipeline_feedback);
@ -2412,7 +2413,7 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
gs_copy_hash[0] ^= 1; gs_copy_hash[0] ^= 1;
bool found_in_application_cache = true; bool found_in_application_cache = true;
if (modules[MESA_SHADER_GEOMETRY]) { if (modules[MESA_SHADER_GEOMETRY] && !use_ngg) {
struct radv_shader_variant *variants[MESA_SHADER_STAGES] = {0}; struct radv_shader_variant *variants[MESA_SHADER_STAGES] = {0};
radv_create_shader_variants_from_pipeline_cache(device, cache, gs_copy_hash, variants, radv_create_shader_variants_from_pipeline_cache(device, cache, gs_copy_hash, variants,
&found_in_application_cache); &found_in_application_cache);
@ -2563,7 +2564,7 @@ void radv_create_shaders(struct radv_pipeline *pipeline,
} }
} }
if(modules[MESA_SHADER_GEOMETRY]) { if(modules[MESA_SHADER_GEOMETRY] && !use_ngg) {
struct radv_shader_binary *gs_copy_binary = NULL; struct radv_shader_binary *gs_copy_binary = NULL;
if (!pipeline->gs_copy_shader) { if (!pipeline->gs_copy_shader) {
pipeline->gs_copy_shader = radv_create_gs_copy_shader( pipeline->gs_copy_shader = radv_create_gs_copy_shader(