From df4613a82e3fe06e97bac53a2d35ce35e7f7429c Mon Sep 17 00:00:00 2001 From: IndecisiveTurtle <47210458+raphaelthegreat@users.noreply.github.com> Date: Tue, 24 Dec 2024 01:34:22 +0200 Subject: [PATCH] review --- src/shader_recompiler/backend/spirv/emit_spirv_quad_rect.cpp | 5 ++++- src/video_core/amdgpu/liverpool.cpp | 2 +- src/video_core/renderer_vulkan/vk_platform.cpp | 2 +- src/video_core/renderer_vulkan/vk_rasterizer.cpp | 4 +--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/shader_recompiler/backend/spirv/emit_spirv_quad_rect.cpp b/src/shader_recompiler/backend/spirv/emit_spirv_quad_rect.cpp index 5325470b7..185359424 100644 --- a/src/shader_recompiler/backend/spirv/emit_spirv_quad_rect.cpp +++ b/src/shader_recompiler/backend/spirv/emit_spirv_quad_rect.cpp @@ -8,9 +8,12 @@ namespace Shader::Backend::SPIRV { using Sirit::Id; +constexpr u32 SPIRV_VERSION_1_3 = 0x00010300; + struct QuadRectListEmitter : public Sirit::Module { explicit QuadRectListEmitter(size_t num_attribs_) - : num_attribs{num_attribs_}, inputs{num_attribs}, outputs{num_attribs} { + : Sirit::Module{SPIRV_VERSION_1_3}, num_attribs{num_attribs_}, inputs{num_attribs}, + outputs{num_attribs} { void_id = TypeVoid(); bool_id = TypeBool(); float_id = TypeFloat(32); diff --git a/src/video_core/amdgpu/liverpool.cpp b/src/video_core/amdgpu/liverpool.cpp index 5dd3edd6d..aa45ffe96 100644 --- a/src/video_core/amdgpu/liverpool.cpp +++ b/src/video_core/amdgpu/liverpool.cpp @@ -1,6 +1,6 @@ // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later - +#pragma clang optimize off #include #include "common/assert.h" diff --git a/src/video_core/renderer_vulkan/vk_platform.cpp b/src/video_core/renderer_vulkan/vk_platform.cpp index 40bcb0506..dbdabe0d9 100644 --- a/src/video_core/renderer_vulkan/vk_platform.cpp +++ b/src/video_core/renderer_vulkan/vk_platform.cpp @@ -1,6 +1,6 @@ // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-License-Identifier: GPL-2.0-or-later -#pragma clang optimize off + // Include the vulkan platform specific header #if defined(ANDROID) #define VK_USE_PLATFORM_ANDROID_KHR diff --git a/src/video_core/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cpp index a8c93f8a8..3eb1a1b5b 100644 --- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp +++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp @@ -214,7 +214,6 @@ void Rasterizer::Draw(bool is_indexed, u32 index_offset) { return; } - auto state = PrepareRenderState(pipeline->GetMrtMask()); if (!BindResources(pipeline)) { return; @@ -237,8 +236,7 @@ void Rasterizer::Draw(bool is_indexed, u32 index_offset) { cmdbuf.drawIndexed(num_indices, regs.num_instances.NumInstances(), 0, s32(vertex_offset), instance_offset); } else { - cmdbuf.draw(num_indices, regs.num_instances.NumInstances(), vertex_offset, - instance_offset); + cmdbuf.draw(num_indices, regs.num_instances.NumInstances(), vertex_offset, instance_offset); } ResetBindings();