This commit is contained in:
IndecisiveTurtle 2024-12-24 01:34:22 +02:00
parent 7366c9af41
commit df4613a82e
4 changed files with 7 additions and 6 deletions

View File

@ -8,9 +8,12 @@ namespace Shader::Backend::SPIRV {
using Sirit::Id; using Sirit::Id;
constexpr u32 SPIRV_VERSION_1_3 = 0x00010300;
struct QuadRectListEmitter : public Sirit::Module { struct QuadRectListEmitter : public Sirit::Module {
explicit QuadRectListEmitter(size_t num_attribs_) 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(); void_id = TypeVoid();
bool_id = TypeBool(); bool_id = TypeBool();
float_id = TypeFloat(32); float_id = TypeFloat(32);

View File

@ -1,6 +1,6 @@
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma clang optimize off
#include <boost/preprocessor/stringize.hpp> #include <boost/preprocessor/stringize.hpp>
#include "common/assert.h" #include "common/assert.h"

View File

@ -1,6 +1,6 @@
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project // SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma clang optimize off
// Include the vulkan platform specific header // Include the vulkan platform specific header
#if defined(ANDROID) #if defined(ANDROID)
#define VK_USE_PLATFORM_ANDROID_KHR #define VK_USE_PLATFORM_ANDROID_KHR

View File

@ -214,7 +214,6 @@ void Rasterizer::Draw(bool is_indexed, u32 index_offset) {
return; return;
} }
auto state = PrepareRenderState(pipeline->GetMrtMask()); auto state = PrepareRenderState(pipeline->GetMrtMask());
if (!BindResources(pipeline)) { if (!BindResources(pipeline)) {
return; 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), cmdbuf.drawIndexed(num_indices, regs.num_instances.NumInstances(), 0, s32(vertex_offset),
instance_offset); instance_offset);
} else { } else {
cmdbuf.draw(num_indices, regs.num_instances.NumInstances(), vertex_offset, cmdbuf.draw(num_indices, regs.num_instances.NumInstances(), vertex_offset, instance_offset);
instance_offset);
} }
ResetBindings(); ResetBindings();