OSDN Git Service

radv/gfx10: fix number of GS invocations for NGG
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Thu, 11 Jul 2019 06:44:12 +0000 (08:44 +0200)
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>
Thu, 11 Jul 2019 13:45:40 +0000 (15:45 +0200)
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
src/amd/vulkan/radv_pipeline.c

index f259f01..2ea984c 100644 (file)
@@ -1651,7 +1651,7 @@ calculate_ngg_info(const VkGraphicsPipelineCreateInfo *pCreateInfo,
        unsigned max_verts_per_prim = radv_get_num_input_vertices(pipeline);
        unsigned min_verts_per_prim =
                gs_type == MESA_SHADER_GEOMETRY ? max_verts_per_prim : 1;
-       unsigned gs_num_invocations = 1;//MAX2(gs_info->gs.invocations, 1);
+       unsigned gs_num_invocations = radv_pipeline_has_gs(pipeline) ? MAX2(gs_info->gs.invocations, 1) : 1;
        bool uses_adjacency;
        switch(pCreateInfo->pInputAssemblyState->topology) {
        case VK_PRIMITIVE_TOPOLOGY_LINE_LIST_WITH_ADJACENCY: