From 6f28539ccc78b8107bf4f16fe16ef1dbe56728b0 Mon Sep 17 00:00:00 2001 From: Nolan Check Date: Sun, 19 Jul 2009 08:24:30 +0000 Subject: [PATCH] Rename scale_something to scale_invert. Plus, sneak in a tiny Thread.h change. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3845 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/Thread.h | 2 +- Source/Core/VideoCommon/Src/BPMemory.h | 2 +- Source/Core/VideoCommon/Src/BPStructs.cpp | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Core/Common/Src/Thread.h b/Source/Core/Common/Src/Thread.h index f6fc7cc7ee..8cd29726e0 100644 --- a/Source/Core/Common/Src/Thread.h +++ b/Source/Core/Common/Src/Thread.h @@ -182,7 +182,7 @@ void SleepCurrentThread(int ms); inline void YieldCPU() { #ifdef _WIN32 - YieldProcessor(); + SwitchToThread(); #elif defined _POSIX_THREADS sched_yield(); #endif diff --git a/Source/Core/VideoCommon/Src/BPMemory.h b/Source/Core/VideoCommon/Src/BPMemory.h index 7478d3579c..73ffde4963 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.h +++ b/Source/Core/VideoCommon/Src/BPMemory.h @@ -814,7 +814,7 @@ union UPE_Copy unsigned target_pixel_format : 4; // realformat is (fmt/2)+((fmt&1)*8).... for some reason the msb is the lsb unsigned gamma : 2; unsigned half_scale : 1; // real size should be 2x smaller (run a gauss filter?) - unsigned scale_something : 1; + unsigned scale_invert : 1; unsigned clear : 1; unsigned frame_to_field : 2; unsigned copy_to_xfb : 1; diff --git a/Source/Core/VideoCommon/Src/BPStructs.cpp b/Source/Core/VideoCommon/Src/BPStructs.cpp index 6629f3f17b..678242d348 100644 --- a/Source/Core/VideoCommon/Src/BPStructs.cpp +++ b/Source/Core/VideoCommon/Src/BPStructs.cpp @@ -208,9 +208,7 @@ void BPWritten(const Bypass& bp) #endif float yScale; - // PE_copy.scale_something may indicate that yScale is inverted. - // Not 100% sure if that's true, but this seems to fix SMG in PAL50 mode. - if (PE_copy.scale_something) + if (PE_copy.scale_invert) yScale = 256.0f / (float)bpmem.dispcopyyscale; else yScale = (float)bpmem.dispcopyyscale / 256.0f;