N-archive/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-11-02 13:02:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: clang-format

Browse source
This commit is contained in:
Samuliak 2024-10-06 13:46:16 +02:00
parent 1efdd483b7
commit 86b1f41de6
No known key found for this signature in database
7 changed files with 133 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/video_core/renderer_metal/maxwell_to_mtl.h
View file

@ -146,7 +146,8 @@ inline size_t GetTextureBytesPerRow(VideoCore::Surface::PixelFormat pixel_format
format_info.bytes_per_block;
}
inline MTL::VertexFormat VertexFormat(Maxwell::VertexAttribute::Type type, Maxwell::VertexAttribute::Size size) {
inline MTL::VertexFormat VertexFormat(Maxwell::VertexAttribute::Type type,
Maxwell::VertexAttribute::Size size) {
const MTL::VertexFormat format{([&]() {
switch (type) {
case Maxwell::VertexAttribute::Type::UnusedEnumDoNotUseBecauseItWillGoAway:

4
src/video_core/renderer_metal/mtl_buffer_cache.cpp
View file

@ -83,8 +83,8 @@ void BufferCacheRuntime::CopyBuffer(MTL::Buffer* dst_buffer, MTL::Buffer* src_bu
}
void BufferCacheRuntime::ClearBuffer(MTL::Buffer* dest_buffer, u32 offset, size_t size, u32 value) {
LOG_DEBUG(Render_Metal, "called (buffer: {}, offset: {}, size: {}, value: {})", (void*)dest_buffer,
offset, size, value);
LOG_DEBUG(Render_Metal, "called (buffer: {}, offset: {}, size: {}, value: {})",
(void*)dest_buffer, offset, size, value);
// TODO: clear buffer
}

3
src/video_core/renderer_metal/mtl_buffer_cache.h
View file

@ -110,8 +110,7 @@ public:
void BindQuadIndexBuffer(PrimitiveTopology topology, u32 first, u32 count);
void BindVertexBuffer(u32 index, MTL::Buffer* buffer, u32 offset, u32 size,
u32 stride);
void BindVertexBuffer(u32 index, MTL::Buffer* buffer, u32 offset, u32 size, u32 stride);
void BindVertexBuffers(VideoCommon::HostBindings<Buffer>& bindings);

5
src/video_core/renderer_metal/mtl_graphics_pipeline.cpp
View file

@ -13,12 +13,12 @@
#include "common/bit_field.h"
#include "video_core/buffer_cache/buffer_cache_base.h"
#include "video_core/engines/maxwell_3d.h"
#include "video_core/renderer_metal/maxwell_to_mtl.h"
#include "video_core/renderer_metal/mtl_command_recorder.h"
#include "video_core/renderer_metal/mtl_device.h"
#include "video_core/shader_notify.h"
#include "video_core/texture_cache/texture_cache.h"
#include "video_core/texture_cache/texture_cache_base.h"
#include "video_core/renderer_metal/maxwell_to_mtl.h"
namespace Metal {
namespace {
@ -211,8 +211,7 @@ void GraphicsPipeline::MakePipeline(MTL::RenderPassDescriptor* render_pass) {
const auto& regs{maxwell3d->regs};
// Shader stages
MTL::RenderPipelineDescriptor* desc =
MTL::RenderPipelineDescriptor::alloc()->init();
MTL::RenderPipelineDescriptor* desc = MTL::RenderPipelineDescriptor::alloc()->init();
desc->setVertexFunction(functions[0]);
desc->setFragmentFunction(functions[4]);

20
src/video_core/renderer_metal/mtl_rasterizer.cpp
View file

@ -80,7 +80,8 @@ RasterizerMetal::RasterizerMetal(Tegra::GPU& gpu_,
texture_cache_runtime(device, command_recorder, staging_buffer_pool),
texture_cache(texture_cache_runtime, device_memory),
pipeline_cache(device_memory, device, command_recorder, buffer_cache, texture_cache,
gpu.ShaderNotify()), accelerate_dma(buffer_cache) {}
gpu.ShaderNotify()),
accelerate_dma(buffer_cache) {}
RasterizerMetal::~RasterizerMetal() = default;
void RasterizerMetal::Draw(bool is_indexed, u32 instance_count) {
@ -98,19 +99,24 @@ void RasterizerMetal::Draw(bool is_indexed, u32 instance_count) {
const DrawParams draw_params{MakeDrawParams(draw_state, instance_count, is_indexed)};
// TODO: get the primitive type
MTL::PrimitiveType primitiveType = MTL::PrimitiveTypeTriangle;//MaxwellToMTL::PrimitiveType(draw_state.topology);
MTL::PrimitiveType primitiveType =
MTL::PrimitiveTypeTriangle; // MaxwellToMTL::PrimitiveType(draw_state.topology);
if (is_indexed) {
auto& index_buffer = command_recorder.GetBoundIndexBuffer();
size_t index_buffer_offset = index_buffer.offset + draw_params.first_index * index_buffer.index_size;
size_t index_buffer_offset =
index_buffer.offset + draw_params.first_index * index_buffer.index_size;
ASSERT(index_buffer_offset % 4 == 0);
command_recorder.GetRenderCommandEncoder()->drawIndexedPrimitives(primitiveType, draw_params.num_vertices, index_buffer.index_type, index_buffer.buffer, index_buffer_offset, draw_params.num_instances,
draw_params.base_vertex, draw_params.base_instance);
command_recorder.GetRenderCommandEncoder()->drawIndexedPrimitives(
primitiveType, draw_params.num_vertices, index_buffer.index_type, index_buffer.buffer,
index_buffer_offset, draw_params.num_instances, draw_params.base_vertex,
draw_params.base_instance);
} else {
command_recorder.GetRenderCommandEncoder()->drawPrimitives(primitiveType,
draw_params.base_vertex, draw_params.num_vertices, draw_params.num_instances, draw_params.base_instance);
command_recorder.GetRenderCommandEncoder()->drawPrimitives(
primitiveType, draw_params.base_vertex, draw_params.num_vertices,
draw_params.num_instances, draw_params.base_instance);
}
}