OPENGL: Remove unnecessary aspect ratio corrections, and add "Original Size" correction. Rename _transactionDetails.needHotswap to _transactionDetails.needRefresh.

svn-id: r52054
This commit is contained in:
Alejandro Marzini 2010-08-13 04:48:58 +00:00
parent e18c9a1890
commit a3711160ef
3 changed files with 36 additions and 84 deletions

View file

@ -33,10 +33,6 @@
// Uncomment this to enable the 'on screen display' code.
#define USE_OSD 1
// Uncomment this to enable all aspect ratio corrections
// (Will include 4/3, 16/9, 16/10, 5/3, 5/4)
//#define USE_ALL_ASR 1
namespace OpenGL {
// The OpenGL GFX modes. They have to be inside the OpenGL namespace so they
// do not clash with the SDL GFX modes.
@ -135,7 +131,7 @@ protected:
struct TransactionDetails {
bool sizeChanged;
bool needHotswap;
bool needRefresh;
bool needUpdatescreen;
bool filterChanged;
#ifdef USE_RGB_COLOR
@ -148,11 +144,7 @@ protected:
enum {
kAspectRatioNone,
kAspectRatioConserve,
kAspectRatio4_3,
kAspectRatio16_9,
kAspectRatio16_10,
kAspectRatio5_3,
kAspectRatio5_4
kAspectRatioOriginal
};
struct VideoState {
@ -192,10 +184,6 @@ protected:
int _aspectWidth;
int _aspectHeight;
#ifndef USE_ALL_ASR
int _desiredAspectRatio;
#endif
/**
* Sets the aspect ratio mode.
* @mode the aspect ratio mode, if -1 it will switch to next mode.