diff --git a/src/graphics/host_gpu/renderer/pipeline/descriptors.cpp b/src/graphics/host_gpu/renderer/pipeline/descriptors.cpp index 09a592baf..241b270ab 100644 --- a/src/graphics/host_gpu/renderer/pipeline/descriptors.cpp +++ b/src/graphics/host_gpu/renderer/pipeline/descriptors.cpp @@ -91,19 +91,6 @@ vk::DescriptorImageInfo MakeImageInfo(const TextureBinding& texture, uint32_t el return {nullptr, view, texture.layout}; } -static const char* ShaderStageResourceName(ShaderType stage) { - switch (stage) { - case ShaderType::Vertex: return "Vertex"; - case ShaderType::Mesh: return "Mesh"; - case ShaderType::Local: return "Local"; - case ShaderType::TessellationControl: return "Hull"; - case ShaderType::TessellationEvaluation: return "Domain"; - case ShaderType::Pixel: return "Pixel"; - case ShaderType::Compute: return "Compute"; - default: return "Unknown"; - } -} - static Prospero::ImageType TextureType(const ShaderTextureResource& descriptor) { const auto type = descriptor.Type(); return type == Prospero::ImageType::kCube ? Prospero::ImageType::kColor2DArray : type; @@ -126,8 +113,7 @@ static bool IsMultisampledTexture(Prospero::ImageType type) { static vk::DescriptorBufferInfo NativeStorageBuffer(RenderContext& context, const PreparedBindings::BufferSource& source, - const ShaderRecompiler::IR::BufferResource& resource, ShaderType stage, - uint32_t slot, uint32_t& buffer_offset) { + const ShaderRecompiler::IR::BufferResource& resource, uint32_t& buffer_offset) { buffer_offset = 0; const auto& [address, size, id] = source; @@ -152,16 +138,6 @@ NativeStorageBuffer(RenderContext& context, const PreparedBindings::BufferSource if (resource.written) { context.GetTextureCache().InvalidateMemoryFromGPU(address, size); } - const char* access = "Read"; - if (resource.written && resource.read) { - access = "ReadWrite"; - } else if (resource.written) { - access = "Write"; - } - SetVulkanObjectNameF( - graphics.device, result.buffer, - "Kyty.{}.StorageBuffer[slot={} guest=0x{:016x} size=0x{:x} access={} formatted={}]", - ShaderStageResourceName(stage), slot, address, size, access, resource.formatted); return result; } @@ -874,7 +850,7 @@ void RenderExecutor::RebindBuffers(PreparedBindings& prepared) { uint32_t buffer_offset = 0; prepared.buffers.push_back(NativeStorageBuffer(m_context, prepared.buffer_sources[i], program.info.buffers[resource], - program.stage, resource, buffer_offset)); + buffer_offset)); pack_memory_offset(i, buffer_offset); } if (ShaderRecompiler::IR::FindBinding( diff --git a/src/graphics/host_gpu/renderer/renderDraw.cpp b/src/graphics/host_gpu/renderer/renderDraw.cpp index 627e63395..5a226bdf0 100644 --- a/src/graphics/host_gpu/renderer/renderDraw.cpp +++ b/src/graphics/host_gpu/renderer/renderDraw.cpp @@ -718,9 +718,6 @@ static PreparedVertexBuffers AcquireVertexBuffers(CommandBuffer& b Libs::LibKernel::Memory::ClampRangeSize(range.base_address, range.RequestedSize()); range.acquired_end = range.base_address + size; range.binding = cache.ObtainBuffer(range.base_address, size, false); - SetVulkanObjectNameF( - buffer.GetContext().GetGraphics().device, range.binding.first->Handle(), - "Kyty.VertexBufferRange[guest=0x{:016x} size=0x{:x}]", range.base_address, size); } // Rebuild slot bindings, offsetting non-empty slots into their acquired merged range. @@ -752,10 +749,6 @@ static PreparedVertexBuffers AcquireVertexBuffers(CommandBuffer& b prepared.buffers[i] = range->binding.first->Handle(); prepared.offsets[i] = range->binding.second + vertex.addr - range->base_address; prepared.sizes[i] = std::min(size, range->acquired_end - vertex.addr); - SetVulkanObjectNameF( - buffer.GetContext().GetGraphics().device, prepared.buffers[i], - "Kyty.VertexBuffer[slot={} guest=0x{:016x} size=0x{:x} stride={} records={}]", i, - vertex.addr, size, vertex.stride, vertex.num_records); } return prepared; @@ -937,17 +930,11 @@ static PreparedIndexBuffer PrepareIndexBuffer(CommandBuffer& buffe auto& stream = buffer.GetContext().GetBufferCache().GetUtilityBuffer(MemoryUsage::Stream); prepared.offset = stream.Copy(source.host_data, source.size, 16); prepared.buffer = stream.Handle(); - SetVulkanObjectNameF(buffer.GetContext().GetGraphics().device, prepared.buffer, - "Kyty.IndexBuffer[guest=transient size=0x{:x} type={}]", source.size, - static_cast(source.type)); } else { auto [buffer_ptr, offset] = buffer.GetContext().GetBufferCache().ObtainBuffer(source.address, source.size, false); prepared.buffer = buffer_ptr->Handle(); prepared.offset = offset; - SetVulkanObjectNameF(buffer.GetContext().GetGraphics().device, prepared.buffer, - "Kyty.IndexBuffer[guest=0x{:016x} size=0x{:x} type={}]", - source.address, source.size, static_cast(source.type)); } return prepared; }