radv: add a workaround for Monster Hunter World and LLVM 7&8
[mesa.git] / src / amd / vulkan / radv_cmd_buffer.c
index b04c998fac2ed33030203ec59355b1ac1ec49d2d..ec1fcf4fd64658b16bc538c928226486e9c76ceb 100644 (file)
@@ -215,7 +215,7 @@ radv_bind_streamout_state(struct radv_cmd_buffer *cmd_buffer,
 bool radv_cmd_buffer_uses_mec(struct radv_cmd_buffer *cmd_buffer)
 {
        return cmd_buffer->queue_family_index == RADV_QUEUE_COMPUTE &&
-              cmd_buffer->device->physical_device->rad_info.chip_class >= CIK;
+              cmd_buffer->device->physical_device->rad_info.chip_class >= GFX7;
 }
 
 enum ring_type radv_queue_family_to_ring(int f) {
@@ -301,7 +301,6 @@ radv_cmd_buffer_destroy(struct radv_cmd_buffer *cmd_buffer)
 static VkResult
 radv_reset_cmd_buffer(struct radv_cmd_buffer *cmd_buffer)
 {
-
        cmd_buffer->device->ws->cs_reset(cmd_buffer->cs);
 
        list_for_each_entry_safe(struct radv_cmd_buffer_upload, up,
@@ -326,6 +325,8 @@ radv_reset_cmd_buffer(struct radv_cmd_buffer *cmd_buffer)
 
        cmd_buffer->record_result = VK_SUCCESS;
 
+       memset(cmd_buffer->vertex_bindings, 0, sizeof(cmd_buffer->vertex_bindings));
+
        for (unsigned i = 0; i < VK_PIPELINE_BIND_POINT_RANGE_SIZE; i++) {
                cmd_buffer->descriptors[i].dirty = 0;
                cmd_buffer->descriptors[i].valid = 0;
@@ -1040,7 +1041,7 @@ radv_emit_fb_color_state(struct radv_cmd_buffer *cmd_buffer,
                         struct radv_image *image,
                         VkImageLayout layout)
 {
-       bool is_vi = cmd_buffer->device->physical_device->rad_info.chip_class >= VI;
+       bool is_vi = cmd_buffer->device->physical_device->rad_info.chip_class >= GFX8;
        struct radv_color_buffer_info *cb = &att->cb;
        uint32_t cb_color_info = cb->cb_color_info;
 
@@ -1628,8 +1629,8 @@ radv_emit_framebuffer_state(struct radv_cmd_buffer *cmd_buffer)
                               S_028208_BR_X(framebuffer->width) |
                               S_028208_BR_Y(framebuffer->height));
 
-       if (cmd_buffer->device->physical_device->rad_info.chip_class >= VI) {
-               uint8_t watermark = 4; /* Default value for VI. */
+       if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX8) {
+               uint8_t watermark = 4; /* Default value for GFX8. */
 
                /* For optimal DCC performance. */
                if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX9) {
@@ -1690,7 +1691,7 @@ void radv_set_db_count_control(struct radv_cmd_buffer *cmd_buffer)
        uint32_t db_count_control;
 
        if(!cmd_buffer->state.active_occlusion_queries) {
-               if (cmd_buffer->device->physical_device->rad_info.chip_class >= CIK) {
+               if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX7) {
                        if (G_028A4C_OUT_OF_ORDER_PRIMITIVE_ENABLE(pa_sc_mode_cntl_1) &&
                            pipeline->graphics.disable_out_of_order_rast_for_occlusion &&
                            has_perfect_queries) {
@@ -1709,7 +1710,7 @@ void radv_set_db_count_control(struct radv_cmd_buffer *cmd_buffer)
                const struct radv_subpass *subpass = cmd_buffer->state.subpass;
                uint32_t sample_rate = subpass ? util_logbase2(subpass->max_sample_count) : 0;
 
-               if (cmd_buffer->device->physical_device->rad_info.chip_class >= CIK) {
+               if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX7) {
                        db_count_control =
                                S_028004_PERFECT_ZPASS_COUNTS(has_perfect_queries) |
                                S_028004_SAMPLE_RATE(sample_rate) |
@@ -2018,7 +2019,7 @@ radv_flush_vertex_descriptors(struct radv_cmd_buffer *cmd_buffer,
                        va += offset + buffer->offset;
                        desc[0] = va;
                        desc[1] = S_008F04_BASE_ADDRESS_HI(va >> 32) | S_008F04_STRIDE(stride);
-                       if (cmd_buffer->device->physical_device->rad_info.chip_class <= CIK && stride)
+                       if (cmd_buffer->device->physical_device->rad_info.chip_class <= GFX7 && stride)
                                desc[2] = (buffer->size - offset - velems->format_size[i]) / stride + 1;
                        else
                                desc[2] = buffer->size - offset;
@@ -2105,7 +2106,7 @@ radv_flush_streamout_descriptors(struct radv_cmd_buffer *cmd_buffer)
 
                        /* Set the descriptor.
                         *
-                        * On VI, the format must be non-INVALID, otherwise
+                        * On GFX8, the format must be non-INVALID, otherwise
                         * the buffer will be considered not bound and store
                         * instructions will be no-ops.
                         */
@@ -2210,7 +2211,7 @@ radv_emit_draw_registers(struct radv_cmd_buffer *cmd_buffer,
                        radeon_set_uconfig_reg_idx(cs,
                                                   R_030960_IA_MULTI_VGT_PARAM,
                                                   4, ia_multi_vgt_param);
-               } else if (info->chip_class >= CIK) {
+               } else if (info->chip_class >= GFX7) {
                        radeon_set_context_reg_idx(cs,
                                                   R_028AA8_IA_MULTI_VGT_PARAM,
                                                   1, ia_multi_vgt_param);
@@ -2947,7 +2948,7 @@ VkResult radv_EndCommandBuffer(
        RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer);
 
        if (cmd_buffer->queue_family_index != RADV_QUEUE_TRANSFER) {
-               if (cmd_buffer->device->physical_device->rad_info.chip_class == SI)
+               if (cmd_buffer->device->physical_device->rad_info.chip_class == GFX6)
                        cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_CS_PARTIAL_FLUSH | RADV_CMD_FLAG_PS_PARTIAL_FLUSH | RADV_CMD_FLAG_WRITEBACK_GLOBAL_L2;
                si_emit_cache_flush(cmd_buffer);
        }
@@ -3823,11 +3824,11 @@ radv_emit_all_graphics_states(struct radv_cmd_buffer *cmd_buffer,
                if (cmd_buffer->state.dirty & RADV_CMD_DIRTY_INDEX_BUFFER)
                        radv_emit_index_buffer(cmd_buffer);
        } else {
-               /* On CI and later, non-indexed draws overwrite VGT_INDEX_TYPE,
+               /* On GFX7 and later, non-indexed draws overwrite VGT_INDEX_TYPE,
                 * so the state must be re-emitted before the next indexed
                 * draw.
                 */
-               if (cmd_buffer->device->physical_device->rad_info.chip_class >= CIK) {
+               if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX7) {
                        cmd_buffer->state.last_index_type = -1;
                        cmd_buffer->state.dirty |= RADV_CMD_DIRTY_INDEX_BUFFER;
                }
@@ -3848,7 +3849,7 @@ radv_draw(struct radv_cmd_buffer *cmd_buffer,
        struct radeon_info *rad_info =
                &cmd_buffer->device->physical_device->rad_info;
        bool has_prefetch =
-               cmd_buffer->device->physical_device->rad_info.chip_class >= CIK;
+               cmd_buffer->device->physical_device->rad_info.chip_class >= GFX7;
        bool pipeline_is_dirty =
                (cmd_buffer->state.dirty & RADV_CMD_DIRTY_PIPELINE) &&
                cmd_buffer->state.pipeline != cmd_buffer->state.emitted_pipeline;
@@ -3858,7 +3859,7 @@ radv_draw(struct radv_cmd_buffer *cmd_buffer,
                                   cmd_buffer->cs, 4096);
 
        if (likely(!info->indirect)) {
-               /* SI-CI treat instance_count==0 as instance_count==1. There is
+               /* GFX6-GFX7 treat instance_count==0 as instance_count==1. There is
                 * no workaround for indirect draws, but we can at least skip
                 * direct draws.
                 */
@@ -4021,55 +4022,6 @@ void radv_CmdDrawIndexedIndirect(
        radv_draw(cmd_buffer, &info);
 }
 
-void radv_CmdDrawIndirectCountAMD(
-       VkCommandBuffer                             commandBuffer,
-       VkBuffer                                    _buffer,
-       VkDeviceSize                                offset,
-       VkBuffer                                    _countBuffer,
-       VkDeviceSize                                countBufferOffset,
-       uint32_t                                    maxDrawCount,
-       uint32_t                                    stride)
-{
-       RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer);
-       RADV_FROM_HANDLE(radv_buffer, buffer, _buffer);
-       RADV_FROM_HANDLE(radv_buffer, count_buffer, _countBuffer);
-       struct radv_draw_info info = {};
-
-       info.count = maxDrawCount;
-       info.indirect = buffer;
-       info.indirect_offset = offset;
-       info.count_buffer = count_buffer;
-       info.count_buffer_offset = countBufferOffset;
-       info.stride = stride;
-
-       radv_draw(cmd_buffer, &info);
-}
-
-void radv_CmdDrawIndexedIndirectCountAMD(
-       VkCommandBuffer                             commandBuffer,
-       VkBuffer                                    _buffer,
-       VkDeviceSize                                offset,
-       VkBuffer                                    _countBuffer,
-       VkDeviceSize                                countBufferOffset,
-       uint32_t                                    maxDrawCount,
-       uint32_t                                    stride)
-{
-       RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer);
-       RADV_FROM_HANDLE(radv_buffer, buffer, _buffer);
-       RADV_FROM_HANDLE(radv_buffer, count_buffer, _countBuffer);
-       struct radv_draw_info info = {};
-
-       info.indexed = true;
-       info.count = maxDrawCount;
-       info.indirect = buffer;
-       info.indirect_offset = offset;
-       info.count_buffer = count_buffer;
-       info.count_buffer_offset = countBufferOffset;
-       info.stride = stride;
-
-       radv_draw(cmd_buffer, &info);
-}
-
 void radv_CmdDrawIndirectCountKHR(
        VkCommandBuffer                             commandBuffer,
        VkBuffer                                    _buffer,
@@ -4285,7 +4237,7 @@ radv_dispatch(struct radv_cmd_buffer *cmd_buffer,
 {
        struct radv_pipeline *pipeline = cmd_buffer->state.compute_pipeline;
        bool has_prefetch =
-               cmd_buffer->device->physical_device->rad_info.chip_class >= CIK;
+               cmd_buffer->device->physical_device->rad_info.chip_class >= GFX7;
        bool pipeline_is_dirty = pipeline &&
                                 pipeline != cmd_buffer->state.emitted_compute_pipeline;
 
@@ -5091,7 +5043,7 @@ static void radv_flush_vgt_streamout(struct radv_cmd_buffer *cmd_buffer)
        unsigned reg_strmout_cntl;
 
        /* The register is at different places on different ASICs. */
-       if (cmd_buffer->device->physical_device->rad_info.chip_class >= CIK) {
+       if (cmd_buffer->device->physical_device->rad_info.chip_class >= GFX7) {
                reg_strmout_cntl = R_0300FC_CP_STRMOUT_CNTL;
                radeon_set_uconfig_reg(cs, reg_strmout_cntl, 0);
        } else {
@@ -5132,7 +5084,7 @@ void radv_CmdBeginTransformFeedbackEXT(
                if (counter_buffer_idx >= 0 && counter_buffer_idx >= counterBufferCount)
                        counter_buffer_idx = -1;
 
-               /* SI binds streamout buffers as shader resources.
+               /* AMD GCN binds streamout buffers as shader resources.
                 * VGT only counts primitives and tells the shader through
                 * SGPRs what to do.
                 */