Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-06-09 12:13:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

video_core: Address some feedback

Browse source
This commit is contained in:
raphaelthegreat 2024-05-27 22:12:49 +03:00
parent d59b102b6f
commit 4d728e943d
8 changed files with 34 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/video_core/renderer_vulkan/liverpool_to_vk.cpp
View file

@ -80,7 +80,7 @@ vk::PrimitiveTopology PrimitiveType(Liverpool::PrimitiveType type) {
// Needs to generate index buffer on the fly.
return vk::PrimitiveTopology::eTriangleList;
case Liverpool::PrimitiveType::RectList:
return vk::PrimitiveTopology::eTriangleList;
return vk::PrimitiveTopology::eTriangleStrip;
default:
UNREACHABLE();
return vk::PrimitiveTopology::eTriangleList;

3
src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp
View file

@ -62,6 +62,9 @@ GraphicsPipeline::GraphicsPipeline(const Instance& instance_, Scheduler& schedul
.pVertexAttributeDescriptions = attributes.data(),
};
ASSERT_MSG(key.prim_type != Liverpool::PrimitiveType::RectList || IsEmbeddedVs(),
"Rectangle List primitive type is only supported for embedded VS");
const vk::PipelineInputAssemblyStateCreateInfo input_assembly = {
.topology = LiverpoolToVK::PrimitiveType(key.prim_type),
.primitiveRestartEnable = false,

5
src/video_core/renderer_vulkan/vk_graphics_pipeline.h
View file

@ -61,6 +61,11 @@ public:
return *pipeline;
}
[[nodiscard]] bool IsEmbeddedVs() const noexcept {
static constexpr size_t EmbeddedVsHash = 0x59c556606a027efd;
return key.stage_hashes[0] == EmbeddedVsHash;
}
private:
void BuildDescSetLayout();

3
src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
View file

@ -145,6 +145,9 @@ void PipelineCache::DumpShader(std::span<const u32> code, u64 hash, Shader::Stag
std::string_view ext) {
using namespace Common::FS;
const auto dump_dir = GetUserPath(PathType::ShaderDir) / "dumps";
if (!std::filesystem::exists(dump_dir)) {
std::filesystem::create_directories(dump_dir);
}
const auto filename = fmt::format("{}_{:#X}.{}", stage, hash, ext);
const auto file = IOFile{dump_dir / filename, FileAccessMode::Write};
file.WriteSpan(code);

7
src/video_core/renderer_vulkan/vk_rasterizer.cpp
View file

@ -22,7 +22,7 @@ Rasterizer::Rasterizer(const Instance& instance_, Scheduler& scheduler_,
: instance{instance_}, scheduler{scheduler_}, texture_cache{texture_cache_},
liverpool{liverpool_}, memory{Core::Memory::Instance()},
pipeline_cache{instance, scheduler, liverpool},
vertex_index_buffer{instance, scheduler, VertexIndexFlags, 128_MB} {
vertex_index_buffer{instance, scheduler, VertexIndexFlags, 32_MB} {
if (!Config::nullGpu()) {
liverpool->BindRasterizer(this);
}
@ -63,7 +63,8 @@ void Rasterizer::Draw(bool is_indexed) {
if (is_indexed) {
cmdbuf.drawIndexed(num_indices, regs.num_instances.NumInstances(), 0, 0, 0);
} else {
cmdbuf.draw(num_indices, regs.num_instances.NumInstances(), 0, 0);
const u32 num_vertices = pipeline->IsEmbeddedVs() ? 4 : regs.num_indices;
cmdbuf.draw(num_vertices, regs.num_instances.NumInstances(), 0, 0);
}
cmdbuf.endRendering();
}
@ -97,7 +98,7 @@ u32 Rasterizer::SetupIndexBuffer(bool& is_indexed) {
// Upload index data to stream buffer.
const auto index_address = regs.index_base_address.Address<const void*>();
const u32 index_buffer_size = regs.num_indices * 4;
const u32 index_buffer_size = regs.num_indices * index_size;
const auto [data, offset, _] = vertex_index_buffer.Map(index_buffer_size);
std::memcpy(data, index_address, index_buffer_size);
vertex_index_buffer.Commit(index_buffer_size);