summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-09-30 21:34:28 +0200
committerGitHub <noreply@github.com>2021-09-30 21:34:28 +0200
commit8bd5742349007d3faa9d786450a20f31d5db0b94 (patch)
tree29c7669c76fcd9ff5dcd3aa204f68b9af88437a2 /src
parentMerge pull request #7104 from Morph1984/style (diff)
parentmaxwell_dma: Minor refactoring (diff)
downloadyuzu-8bd5742349007d3faa9d786450a20f31d5db0b94.tar
yuzu-8bd5742349007d3faa9d786450a20f31d5db0b94.tar.gz
yuzu-8bd5742349007d3faa9d786450a20f31d5db0b94.tar.bz2
yuzu-8bd5742349007d3faa9d786450a20f31d5db0b94.tar.lz
yuzu-8bd5742349007d3faa9d786450a20f31d5db0b94.tar.xz
yuzu-8bd5742349007d3faa9d786450a20f31d5db0b94.tar.zst
yuzu-8bd5742349007d3faa9d786450a20f31d5db0b94.zip
Diffstat (limited to 'src')
-rw-r--r--src/video_core/buffer_cache/buffer_cache.h7
-rw-r--r--src/video_core/engines/maxwell_dma.cpp64
-rw-r--r--src/video_core/engines/maxwell_dma.h2
-rw-r--r--src/video_core/renderer_opengl/gl_buffer_cache.cpp3
4 files changed, 37 insertions, 39 deletions
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h
index 7bfd57369..d350c9b36 100644
--- a/src/video_core/buffer_cache/buffer_cache.h
+++ b/src/video_core/buffer_cache/buffer_cache.h
@@ -570,13 +570,12 @@ bool BufferCache<P>::DMACopy(GPUVAddr src_address, GPUVAddr dest_address, u64 am
ForEachWrittenRange(*cpu_src_address, amount, mirror);
// This subtraction in this order is important for overlapping copies.
common_ranges.subtract(subtract_interval);
- bool atleast_1_download = tmp_intervals.size() != 0;
- for (const IntervalType add_interval : tmp_intervals) {
+ const bool has_new_downloads = tmp_intervals.size() != 0;
+ for (const IntervalType& add_interval : tmp_intervals) {
common_ranges.add(add_interval);
}
-
runtime.CopyBuffer(dest_buffer, src_buffer, copies);
- if (atleast_1_download) {
+ if (has_new_downloads) {
dest_buffer.MarkRegionAsGpuModified(*cpu_dest_address, amount);
}
std::vector<u8> tmp_buffer(amount);
diff --git a/src/video_core/engines/maxwell_dma.cpp b/src/video_core/engines/maxwell_dma.cpp
index c7ec1eac9..67388d980 100644
--- a/src/video_core/engines/maxwell_dma.cpp
+++ b/src/video_core/engines/maxwell_dma.cpp
@@ -82,41 +82,41 @@ void MaxwellDMA::Launch() {
}
void MaxwellDMA::CopyPitchToPitch() {
- // When `multi_line_enable` bit is disabled the copy is performed as if we were copying a 1D
- // buffer of length `line_length_in`.
- // Otherwise we copy a 2D image of dimensions (line_length_in, line_count).
- auto& accelerate = rasterizer->AccessAccelerateDMA();
- if (!regs.launch_dma.multi_line_enable) {
- const bool is_buffer_clear = regs.launch_dma.remap_enable != 0 &&
- regs.remap_const.dst_x == RemapConst::Swizzle::CONST_A;
- // TODO: allow multisized components.
- if (is_buffer_clear) {
- ASSERT(regs.remap_const.component_size_minus_one == 3);
- accelerate.BufferClear(regs.offset_out, regs.line_length_in, regs.remap_consta_value);
- std::vector<u32> tmp_buffer(regs.line_length_in, regs.remap_consta_value);
- memory_manager.WriteBlockUnsafe(regs.offset_out,
- reinterpret_cast<u8*>(tmp_buffer.data()),
- regs.line_length_in * sizeof(u32));
- return;
- }
- UNIMPLEMENTED_IF(regs.launch_dma.remap_enable != 0);
- if (!accelerate.BufferCopy(regs.offset_in, regs.offset_out, regs.line_length_in)) {
- std::vector<u8> tmp_buffer(regs.line_length_in);
- memory_manager.ReadBlockUnsafe(regs.offset_in, tmp_buffer.data(), regs.line_length_in);
- memory_manager.WriteBlock(regs.offset_out, tmp_buffer.data(), regs.line_length_in);
+ // When `multi_line_enable` bit is enabled we copy a 2D image of dimensions
+ // (line_length_in, line_count).
+ // Otherwise the copy is performed as if we were copying a 1D buffer of length line_length_in.
+ const bool remap_enabled = regs.launch_dma.remap_enable != 0;
+ if (regs.launch_dma.multi_line_enable) {
+ UNIMPLEMENTED_IF(remap_enabled);
+
+ // Perform a line-by-line copy.
+ // We're going to take a subrect of size (line_length_in, line_count) from the source
+ // rectangle. There is no need to manually flush/invalidate the regions because CopyBlock
+ // does that for us.
+ for (u32 line = 0; line < regs.line_count; ++line) {
+ const GPUVAddr source_line = regs.offset_in + static_cast<size_t>(line) * regs.pitch_in;
+ const GPUVAddr dest_line = regs.offset_out + static_cast<size_t>(line) * regs.pitch_out;
+ memory_manager.CopyBlock(dest_line, source_line, regs.line_length_in);
}
return;
}
-
- UNIMPLEMENTED_IF(regs.launch_dma.remap_enable != 0);
-
- // Perform a line-by-line copy.
- // We're going to take a subrect of size (line_length_in, line_count) from the source rectangle.
- // There is no need to manually flush/invalidate the regions because CopyBlock does that for us.
- for (u32 line = 0; line < regs.line_count; ++line) {
- const GPUVAddr source_line = regs.offset_in + static_cast<size_t>(line) * regs.pitch_in;
- const GPUVAddr dest_line = regs.offset_out + static_cast<size_t>(line) * regs.pitch_out;
- memory_manager.CopyBlock(dest_line, source_line, regs.line_length_in);
+ // TODO: allow multisized components.
+ auto& accelerate = rasterizer->AccessAccelerateDMA();
+ const bool is_const_a_dst = regs.remap_const.dst_x == RemapConst::Swizzle::CONST_A;
+ const bool is_buffer_clear = remap_enabled && is_const_a_dst;
+ if (is_buffer_clear) {
+ ASSERT(regs.remap_const.component_size_minus_one == 3);
+ accelerate.BufferClear(regs.offset_out, regs.line_length_in, regs.remap_consta_value);
+ std::vector<u32> tmp_buffer(regs.line_length_in, regs.remap_consta_value);
+ memory_manager.WriteBlockUnsafe(regs.offset_out, reinterpret_cast<u8*>(tmp_buffer.data()),
+ regs.line_length_in * sizeof(u32));
+ return;
+ }
+ UNIMPLEMENTED_IF(remap_enabled);
+ if (!accelerate.BufferCopy(regs.offset_in, regs.offset_out, regs.line_length_in)) {
+ std::vector<u8> tmp_buffer(regs.line_length_in);
+ memory_manager.ReadBlockUnsafe(regs.offset_in, tmp_buffer.data(), regs.line_length_in);
+ memory_manager.WriteBlock(regs.offset_out, tmp_buffer.data(), regs.line_length_in);
}
}
diff --git a/src/video_core/engines/maxwell_dma.h b/src/video_core/engines/maxwell_dma.h
index 9e457ae16..a04514425 100644
--- a/src/video_core/engines/maxwell_dma.h
+++ b/src/video_core/engines/maxwell_dma.h
@@ -175,7 +175,7 @@ public:
static_assert(sizeof(LaunchDMA) == 4);
struct RemapConst {
- enum Swizzle : u32 {
+ enum class Swizzle : u32 {
SRC_X = 0,
SRC_Y = 1,
SRC_Z = 2,
diff --git a/src/video_core/renderer_opengl/gl_buffer_cache.cpp b/src/video_core/renderer_opengl/gl_buffer_cache.cpp
index 07a995f7d..187a28e4d 100644
--- a/src/video_core/renderer_opengl/gl_buffer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_buffer_cache.cpp
@@ -147,8 +147,7 @@ void BufferCacheRuntime::CopyBuffer(Buffer& dst_buffer, Buffer& src_buffer,
void BufferCacheRuntime::ClearBuffer(Buffer& dest_buffer, u32 offset, size_t size, u32 value) {
glClearNamedBufferSubData(dest_buffer.Handle(), GL_R32UI, static_cast<GLintptr>(offset),
- static_cast<GLsizeiptr>(size / sizeof(u32)), GL_RED, GL_UNSIGNED_INT,
- &value);
+ static_cast<GLsizeiptr>(size), GL_RED, GL_UNSIGNED_INT, &value);
}
void BufferCacheRuntime::BindIndexBuffer(Buffer& buffer, u32 offset, u32 size) {