From 4d81e0739d2cc7112d5167682fd0750836f691a9 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 6 Apr 2013 01:48:00 -0400 Subject: Use an enum for efb scale values. --- Source/Core/VideoCommon/Src/RenderBase.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Source/Core/VideoCommon/Src/RenderBase.cpp') diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index 90a09aec43..652a613b2a 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -144,7 +144,7 @@ int Renderer::EFBToScaledX(int x) { switch (g_ActiveConfig.iEFBScale) { - case 0: // fractional + case SCALE_AUTO: // fractional return (int)ssaa_multiplier * FramebufferManagerBase::ScaleToVirtualXfbWidth(x, s_backbuffer_width); default: @@ -156,7 +156,7 @@ int Renderer::EFBToScaledY(int y) { switch (g_ActiveConfig.iEFBScale) { - case 0: // fractional + case SCALE_AUTO: // fractional return (int)ssaa_multiplier * FramebufferManagerBase::ScaleToVirtualXfbHeight(y, s_backbuffer_height); default: @@ -166,7 +166,7 @@ int Renderer::EFBToScaledY(int y) void Renderer::CalculateTargetScale(int x, int y, int &scaledX, int &scaledY) { - if (g_ActiveConfig.iEFBScale == 0 || g_ActiveConfig.iEFBScale == 1) + if (g_ActiveConfig.iEFBScale == SCALE_AUTO || g_ActiveConfig.iEFBScale == SCALE_AUTO_INTEGRAL) { scaledX = x; scaledY = y; @@ -283,28 +283,28 @@ void Renderer::DrawDebugText() const char* res_text = ""; switch (g_ActiveConfig.iEFBScale) { - case 0: + case SCALE_AUTO: res_text = "Auto (fractional)"; break; - case 1: + case SCALE_AUTO_INTEGRAL: res_text = "Auto (integral)"; break; - case 2: + case SCALE_1X: res_text = "Native"; break; - case 3: + case SCALE_1_5X: res_text = "1.5x"; break; - case 4: + case SCALE_2X: res_text = "2x"; break; - case 5: + case SCALE_2_5X: res_text = "2.5x"; break; - case 6: + case SCALE_3X: res_text = "3x"; break; - case 7: + case SCALE_4X: res_text = "4x"; break; } -- cgit v1.2.3 From bab9963b00953d60bdd6fabe265d5daa45a27661 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 17 Apr 2013 23:09:55 -0400 Subject: New license header introduced for DiscIO, AudioCommon, InputCommon, VideoCommon, and Common projects. --- Source/Core/VideoCommon/Src/RenderBase.cpp | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'Source/Core/VideoCommon/Src/RenderBase.cpp') diff --git a/Source/Core/VideoCommon/Src/RenderBase.cpp b/Source/Core/VideoCommon/Src/RenderBase.cpp index 652a613b2a..f514af0422 100644 --- a/Source/Core/VideoCommon/Src/RenderBase.cpp +++ b/Source/Core/VideoCommon/Src/RenderBase.cpp @@ -1,19 +1,6 @@ -// Copyright (C) 2003 Dolphin Project. - -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, version 2.0. - -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License 2.0 for more details. - -// A copy of the GPL 2.0 should have been included with the program. -// If not, see http://www.gnu.org/licenses/ - -// Official SVN repository and contact information can be found at -// http://code.google.com/p/dolphin-emu/ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. // --------------------------------------------------------------------------------------------- // GC graphics pipeline -- cgit v1.2.3