actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move OpenGL init to a function

Browse Source 
handle refresh rates
use the SDL change vid mode extension
remove refresh rate stuff
use 16-bit zbuffer, never 32 (we'd probably be fine with 8, even)
This commit is contained in:
Glenn Maynard
2002-11-12 09:29:46 +00:00
parent 33b0eff159
commit 03c2431d01
2 changed files with 77 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay.cpp
+73 -48
View File
@@ -17,6 +17,7 @@
#include "RageTimer.h"
#include "RageException.h"
#include "RageTexture.h"
#include "RageTextureManager.h"
#include "RageMath.h"
#include "RageTypes.h"
#include "GameConstantsAndTypes.h"
@@ -72,31 +73,55 @@ void GetGLExtensions(set<string> &ext)
LOG->Trace("OpenGL extensions: %s", buf);
}
RageDisplay::RageDisplay( bool windowed, int width, int height, int bpp, RefreshRateMode rate, bool vsync )
RageDisplay::RageDisplay( bool windowed, int width, int height, int bpp, int rate, bool vsync )
{
// LOG->Trace( "RageDisplay::RageDisplay()" );
SDL_InitSubSystem(SDL_INIT_VIDEO);
SetVideoMode( windowed, width, height, bpp, rate, vsync );
double fGLVersion = atof( (const char *) glGetString(GL_VERSION) );
g_glVersion = int(roundf(fGLVersion * 10));
LOG->Trace( "OpenGL version %.1f", g_glVersion / 10.);
GetGLExtensions(g_glExts);
if(g_glExts.find("GL_EXT_texture_env_combine") != g_glExts.end())
g_GL_EXT_texture_env_combine = true;
glBlendFuncSeparate = (PFNGLBLENDFUNCSEPARATEPROC) SDL_GL_GetProcAddress ("glBlendFuncSeparate");
SetupOpenGL();
}
void RageDisplay::SetupOpenGL()
{
/*
* Set up OpenGL for 2D rendering.
*/
glDisable(GL_DEPTH_TEST);
glDisable(GL_CULL_FACE);
/*
* Set state variables
*/
glEnable(GL_TEXTURE_2D);
glEnable(GL_BLEND);
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
}
RageDisplay::~RageDisplay()
{
SDL_QuitSubSystem(SDL_INIT_VIDEO);
}
//-----------------------------------------------------------------------------
// Name: SwitchDisplayMode()
// Desc:
//-----------------------------------------------------------------------------
void RageDisplay::SetVideoMode( bool windowed, int width, int height, int bpp, RefreshRateMode rate, bool vsync )
/* Set the video mode. In some cases, changing the video mode will reset
* the rendering context; returns true if we need to reload textures. */
bool RageDisplay::SetVideoMode( bool windowed, int width, int height, int bpp, int rate, bool vsync )
{
// LOG->Trace( "RageDisplay::SetVideoMode( %d, %d, %d, %d, %d, %d )", windowed, width, height, bpp, rate, vsync );
g_flags = 0;
if( !windowed )
g_flags |= SDL_FULLSCREEN;
g_flags |= SDL_DOUBLEBUF;
@@ -105,8 +130,6 @@ void RageDisplay::SetVideoMode( bool windowed, int width, int height, int bpp, R
SDL_ShowCursor( ~g_flags & SDL_FULLSCREEN );
SDL_InitSubSystem(SDL_INIT_VIDEO);
switch( bpp )
{
case 15:
@@ -127,46 +150,54 @@ void RageDisplay::SetVideoMode( bool windowed, int width, int height, int bpp, R
SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
}
/* XXX: bpp? shouldn't this be 4 or 8? */
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, bpp);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, TRUE);
g_screen = SDL_SetVideoMode(width, height, bpp, g_flags);
if(!g_screen)
throw RageException("Failed to open screen!");
#ifdef SDL_HAS_REFRESH_RATE
if(rate == REFRESH_DEFAULT)
SDL_SM_SetRefreshRate(0);
else
SDL_SM_SetRefreshRate(rate);
#endif
double fGLVersion = atof( (const char *) glGetString(GL_VERSION) );
g_glVersion = int(roundf(fGLVersion * 10));
LOG->Trace( "OpenGL version %.1f", g_glVersion / 10.);
GetGLExtensions(g_glExts);
if(g_glExts.find("GL_EXT_texture_env_combine") != g_glExts.end())
g_GL_EXT_texture_env_combine = true;
bool need_reload = false;
/*
* Set up OpenGL for 2D rendering.
*/
glDisable(GL_DEPTH_TEST);
glDisable(GL_CULL_FACE);
#ifndef SDL_HAS_CHANGEVIDEOMODEx
/* We can't change the video mode without nuking the GL context. If we have
* a screen, NULL it out, and signal the caller to reload all textures. */
if(g_screen) {
g_screen = NULL;
need_reload = true;
TEXTUREMAN->InvalidateTextures();
}
#endif
if(!g_screen) {
g_screen = SDL_SetVideoMode(width, height, bpp, g_flags);
if(!g_screen)
throw RageException("Failed to open screen!");
SDL_WM_SetCaption("StepMania", "StepMania");
}
#ifdef SDL_HAS_CHANGEVIDEOMODEx
else
{
SDL_SM_ChangeVideoMode_OpenGL(g_flags, g_screen, width, height);
}
#endif
if(need_reload) {
/* OpenGL state was lost; set up again. */
SetupOpenGL();
}
glViewport(0, 0, g_screen->w, g_screen->h);
/*
* Set state variables
*/
glEnable(GL_TEXTURE_2D);
glEnable(GL_BLEND);
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
/* Clear any junk that's in the framebuffer. */
Clear();
Flip();
// glBegin( GL_TRIANGLES );
// glColor4f( 1,1,1,1 );
// glVertex3f( 0, 0, 0 );
// glVertex3f( 320, 0, 0 );
// glVertex3f( 320, 240, 0 );
// glEnd();
// SDL_GL_SwapBuffers();
return need_reload;
}
int RageDisplay::GetMaxTextureSize() const
@@ -202,12 +233,6 @@ void RageDisplay::Flip()
}
void RageDisplay::GetHzAtResolution(int width, int height, int bpp, CArray<int,int> &add) const
{
}
bool RageDisplay::IsWindowed() const
{
return true; // FIXME
stepmania/src/RageDisplay.h
+4 -4
View File
@@ -18,17 +18,17 @@ struct RageVertex;
#include "RageTypes.h"
enum RefreshRateMode { REFRESH_DEFAULT, REFRESH_MAX, REFRESH_MIN };
const int REFRESH_DEFAULT = 0;
class RageDisplay
{
friend class RageTexture;
public:
RageDisplay( bool windowed, int width, int height, int bpp, RefreshRateMode rate, bool vsync );
RageDisplay( bool windowed, int width, int height, int bpp, int rate, bool vsync );
~RageDisplay();
void SetVideoMode( bool windowed, int width, int height, int bpp, RefreshRateMode rate, bool vsync );
bool SetVideoMode( bool windowed, int width, int height, int bpp, int rate, bool vsync );
void Clear();
void Flip();
@@ -70,7 +70,6 @@ public:
void DrawStrip( const RageVertex v[], int iNumVerts );
void FlushQueue();
void GetHzAtResolution(int width, int height, int bpp, CArray<int,int> &add) const;
int GetMaxTextureSize() const;
/* Statistics */
@@ -81,6 +80,7 @@ public:
protected:
void AddVerts( const RageVertex v[], int iNumVerts );
void SetBlendMode(int src, int dst);
void SetupOpenGL();
};