This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch armhf_test in repository mupen64plus-video-rice.
commit 8f8dfaab28aca36b0d0dc5a5216c0c68d7a1a3ca Author: Sven Eckelmann <[email protected]> Date: Fri Sep 9 10:38:53 2011 +0200 Imported Upstream version 1.99.4+40+4d1f7a6b4a15 --- src/GraphicsContext.cpp | 49 ------------------------------------------------- src/GraphicsContext.h | 4 ---- 2 files changed, 53 deletions(-) diff --git a/src/GraphicsContext.cpp b/src/GraphicsContext.cpp index ca04c83..7497b7b 100644 --- a/src/GraphicsContext.cpp +++ b/src/GraphicsContext.cpp @@ -31,13 +31,6 @@ bool CGraphicsContext::m_deviceCapsIsInitialized = false; bool CGraphicsContext::needCleanScene = false; int CGraphicsContext::m_maxFSAA = 16; int CGraphicsContext::m_maxAnisotropy = 16; -unsigned int CGraphicsContext::m_FullScreenRefreshRates[40] = { 0, 50, 55, 60, 65, 70, 72, 75, 80, 85, 90, 95, 100, 110, 120}; -int CGraphicsContext::m_FullScreenResolutions[40][2] = { - {320,200}, {400,300}, {480,360}, {512,384}, {640,480}, - {800,600}, {1024,768}, {1152,864}, {1280,960}, - {1400,1050}, {1600,1200}, {1920,1440}, {2048,1536}}; -int CGraphicsContext::m_numOfResolutions = 0; -unsigned int CGraphicsContext::m_ColorBufferDepths[4] = {16, 32, 0, 0}; CGraphicsContext * CGraphicsContext::Get(void) { @@ -114,48 +107,6 @@ int __cdecl SortResolutionsCallback( const void* arg1, const void* arg2 ) // This is a static function, will be called when the plugin DLL is initialized void CGraphicsContext::InitDeviceParameters(void) { - int i=0, j; - int numOfFrequency=0, numOfColorDepth = 0; - int numSizes = 64; - m64p_2d_size VideoModeArray[64]; - - // Initialize common device parameters - CGraphicsContext::m_numOfResolutions=0; - memset(&CGraphicsContext::m_FullScreenRefreshRates,0,40*sizeof(unsigned int)); - memset(&CGraphicsContext::m_FullScreenResolutions, 0, 40*2*sizeof(int)); - memset(&CGraphicsContext::m_ColorBufferDepths, 0, 4*sizeof(unsigned int)); - - if (CoreVideo_Init() != M64ERR_SUCCESS) - return; - - if (CoreVideo_ListFullscreenModes(VideoModeArray, &numSizes) != M64ERR_SUCCESS) - return; - - for (i = 0; i < numSizes; i++) - { - for (j = 0; j < CGraphicsContext::m_numOfResolutions; j++) - { - if (VideoModeArray[i].uiWidth == (unsigned int) CGraphicsContext::m_FullScreenResolutions[j][0] && - VideoModeArray[i].uiHeight == (unsigned int) CGraphicsContext::m_FullScreenResolutions[j][1]) - { - break; - } - } - if (j == CGraphicsContext::m_numOfResolutions) - { - CGraphicsContext::m_FullScreenResolutions[CGraphicsContext::m_numOfResolutions][0] = VideoModeArray[i].uiWidth; - CGraphicsContext::m_FullScreenResolutions[CGraphicsContext::m_numOfResolutions][1] = VideoModeArray[i].uiHeight; - CGraphicsContext::m_numOfResolutions++; - } - } - - CGraphicsContext::m_ColorBufferDepths[numOfColorDepth++] = 16; - CGraphicsContext::m_ColorBufferDepths[numOfColorDepth++] = 32; - CGraphicsContext::m_FullScreenRefreshRates[numOfFrequency++] = 60; - - qsort( &CGraphicsContext::m_FullScreenRefreshRates, numOfFrequency, sizeof(unsigned int), SortFrequenciesCallback ); - qsort( &CGraphicsContext::m_FullScreenResolutions, CGraphicsContext::m_numOfResolutions, sizeof(int)*2, SortResolutionsCallback ); - // To initialze device parameters for OpenGL COGLGraphicsContext::InitDeviceParameters(); } diff --git a/src/GraphicsContext.h b/src/GraphicsContext.h index 38032b2..d942f99 100644 --- a/src/GraphicsContext.h +++ b/src/GraphicsContext.h @@ -71,10 +71,6 @@ public: public: static int m_maxFSAA; static int m_maxAnisotropy; - static unsigned int m_FullScreenRefreshRates[40]; - static unsigned int m_ColorBufferDepths[4]; - static int m_FullScreenResolutions[40][2]; - static int m_numOfResolutions; protected: static uint32 m_dwWindowStyle; // Saved window style for mode switches -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-rice.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
