diff options
author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-05-25 20:34:09 +0200 |
---|---|---|
committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-05-29 22:59:29 +0200 |
commit | b1503b202043a577720e28969b74cca6f9c954f8 (patch) | |
tree | 7da9cdd46c0cde990c30c11570882efdca9396c6 /src/core/hw | |
parent | Merge pull request #817 from linkmauve/citra.ico (diff) | |
download | yuzu-b1503b202043a577720e28969b74cca6f9c954f8.tar yuzu-b1503b202043a577720e28969b74cca6f9c954f8.tar.gz yuzu-b1503b202043a577720e28969b74cca6f9c954f8.tar.bz2 yuzu-b1503b202043a577720e28969b74cca6f9c954f8.tar.lz yuzu-b1503b202043a577720e28969b74cca6f9c954f8.tar.xz yuzu-b1503b202043a577720e28969b74cca6f9c954f8.tar.zst yuzu-b1503b202043a577720e28969b74cca6f9c954f8.zip |
Diffstat (limited to 'src/core/hw')
-rw-r--r-- | src/core/hw/gpu.cpp | 10 | ||||
-rw-r--r-- | src/core/hw/lcd.cpp | 2 | ||||
-rw-r--r-- | src/core/hw/lcd.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index ddc5d647e..ed607646e 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp @@ -140,7 +140,7 @@ inline void Write(u32 addr, const T data) { // Raw copies do not perform color conversion nor tiled->linear / linear->tiled conversions // TODO(Subv): Verify if raw copies perform scaling memcpy(dst_pointer, src_pointer, output_size); - + LOG_TRACE(HW_GPU, "DisplayTriggerTransfer: 0x%08x bytes from 0x%08x(%ux%u)-> 0x%08x(%ux%u), output format: %x, flags 0x%08X, Raw copy", output_size, config.GetPhysicalInputAddress(), config.input_width.Value(), config.input_height.Value(), @@ -159,14 +159,14 @@ inline void Write(u32 addr, const T data) { for (u32 x = 0; x < output_width; ++x) { Math::Vec4<u8> src_color = { 0, 0, 0, 0 }; - // Calculate the [x,y] position of the input image + // Calculate the [x,y] position of the input image // based on the current output position and the scale u32 input_x = x * horizontal_scale; u32 input_y = y * vertical_scale; if (config.flip_vertically) { - // Flip the y value of the output data, - // we do this after calculating the [x,y] position of the input image + // Flip the y value of the output data, + // we do this after calculating the [x,y] position of the input image // to account for the scaling options. y = output_height - y - 1; } @@ -302,7 +302,7 @@ static void VBlankCallback(u64 userdata, int cycles_late) { // - If frameskip == 0 (disabled), always swap buffers // - If frameskip == 1, swap buffers every other frame (starting from the first frame) // - If frameskip > 1, swap buffers every frameskip^n frames (starting from the second frame) - if ((((Settings::values.frame_skip != 1) ^ last_skip_frame) && last_skip_frame != g_skip_frame) || + if ((((Settings::values.frame_skip != 1) ^ last_skip_frame) && last_skip_frame != g_skip_frame) || Settings::values.frame_skip == 0) { VideoCore::g_renderer->SwapBuffers(); } diff --git a/src/core/hw/lcd.cpp b/src/core/hw/lcd.cpp index 09134c95b..963c8d981 100644 --- a/src/core/hw/lcd.cpp +++ b/src/core/hw/lcd.cpp @@ -66,5 +66,5 @@ void Init() { void Shutdown() { LOG_DEBUG(HW_LCD, "shutdown OK"); } - + } // namespace diff --git a/src/core/hw/lcd.h b/src/core/hw/lcd.h index fb14c3b21..8631eb201 100644 --- a/src/core/hw/lcd.h +++ b/src/core/hw/lcd.h @@ -85,5 +85,5 @@ void Init(); /// Shutdown hardware void Shutdown(); - + } // namespace |