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

centralize pulling in opengl

Browse Source 
make gl data available externally (but separately from RageDisplay)
clean up extension stuff
This commit is contained in:
Glenn Maynard
2002-12-30 00:48:31 +00:00
parent fd7dbed3b7
commit 9607765e1e
3 changed files with 106 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageDisplay.cpp
+36 -55
View File
@@ -11,6 +11,7 @@
*/
#include "RageDisplay.h"
#include "RageDisplayInternal.h"
#include "RageUtil.h"
#include "RageLog.h"
@@ -22,16 +23,6 @@
#include "RageTypes.h"
#include "GameConstantsAndTypes.h"
#include <set>
#include "SDL.h"
/* ours is more up-to-date */
#define NO_SDL_GLEXT
#define __glext_h_ /* try harder to stop glext.h from being forced on us by someone else */
#include "SDL_opengl.h"
#include "glext.h"
RageDisplay* DISPLAY = NULL;
////////////
@@ -51,25 +42,6 @@ int g_iFPS, g_iVPF, g_iDPF;
int g_PerspectiveMode = 0;
struct oglspecs_t {
/* OpenGL system information that generally doesn't change at runtime. */
/* Range and granularity of points and lines: */
float line_range[2];
float line_granularity;
float point_range[2];
float point_granularity;
/* OpenGL version * 10: */
int glVersion;
/* Available extensions: */
set<string> glExts;
/* Which extensions we actually use are supported: */
bool EXT_texture_env_combine;
} g_oglspecs;
int g_CurrentHeight, g_CurrentWidth, g_CurrentBPP;
int RageDisplay::GetFPS() const { return g_iFPS; }
@@ -80,9 +52,6 @@ static int g_iFramesRenderedSinceLastCheck,
g_iVertsRenderedSinceLastCheck,
g_iDrawsSinceLastCheck;
typedef BOOL (APIENTRY * PWSWAPINTERVALEXTPROC) (int interval);
PWSWAPINTERVALEXTPROC wglSwapIntervalEXT;
void GetGLExtensions(set<string> &ext)
{
const char *buf = (const char *)glGetString(GL_EXTENSIONS);
@@ -99,6 +68,8 @@ RageDisplay::RageDisplay( bool windowed, int width, int height, int bpp, int rat
{
// LOG->Trace( "RageDisplay::RageDisplay()" );
m_oglspecs = new oglspecs_t;
SDL_InitSubSystem(SDL_INIT_VIDEO);
SetVideoMode( windowed, width, height, bpp, rate, vsync );
@@ -107,14 +78,14 @@ RageDisplay::RageDisplay( bool windowed, int width, int height, int bpp, int rat
/* Log this, so if people complain that the radar looks bad on their
* system we can compare them: */
glGetFloatv(GL_LINE_WIDTH_RANGE, g_oglspecs.line_range);
LOG->Trace("Line width range: %f, %f", g_oglspecs.line_range[0], g_oglspecs.line_range[1]);
glGetFloatv(GL_LINE_WIDTH_GRANULARITY, &g_oglspecs.line_granularity);
LOG->Trace("Line width granularity: %f", g_oglspecs.line_granularity);
glGetFloatv(GL_POINT_SIZE_RANGE, g_oglspecs.point_range);
LOG->Trace("Point size range: %f-%f", g_oglspecs.point_range[0], g_oglspecs.point_range[1]);
glGetFloatv(GL_POINT_SIZE_GRANULARITY, &g_oglspecs.point_granularity);
LOG->Trace("Point size granularity: %f", g_oglspecs.point_granularity);
glGetFloatv(GL_LINE_WIDTH_RANGE, m_oglspecs->line_range);
LOG->Trace("Line width range: %f, %f", m_oglspecs->line_range[0], m_oglspecs->line_range[1]);
glGetFloatv(GL_LINE_WIDTH_GRANULARITY, &m_oglspecs->line_granularity);
LOG->Trace("Line width granularity: %f", m_oglspecs->line_granularity);
glGetFloatv(GL_POINT_SIZE_RANGE, m_oglspecs->point_range);
LOG->Trace("Point size range: %f-%f", m_oglspecs->point_range[0], m_oglspecs->point_range[1]);
glGetFloatv(GL_POINT_SIZE_GRANULARITY, &m_oglspecs->point_granularity);
LOG->Trace("Point size granularity: %f", m_oglspecs->point_granularity);
}
void RageDisplay::SetupOpenGL()
@@ -151,23 +122,33 @@ void RageDisplay::SetupOpenGL()
RageDisplay::~RageDisplay()
{
SDL_QuitSubSystem(SDL_INIT_VIDEO);
delete m_oglspecs;
}
bool RageDisplay::HasExtension(CString ext) const
{
return m_oglspecs->glExts.find(ext) != m_oglspecs->glExts.end();
}
void RageDisplay::SetupExtensions()
{
double fGLVersion = atof( (const char *) glGetString(GL_VERSION) );
g_oglspecs.glVersion = int(roundf(fGLVersion * 10));
LOG->Trace( "OpenGL version %.1f", g_oglspecs.glVersion / 10.);
GetGLExtensions(g_oglspecs.glExts);
if(g_oglspecs.glExts.find("GL_EXT_texture_env_combine") != g_oglspecs.glExts.end())
g_oglspecs.EXT_texture_env_combine = true;
m_oglspecs->glVersion = int(roundf(fGLVersion * 10));
LOG->Trace( "OpenGL version %.1f", m_oglspecs->glVersion / 10.);
GetGLExtensions(m_oglspecs->glExts);
/* Windows vsync: */
if(g_oglspecs.glExts.find("WGL_EXT_swap_control") != g_oglspecs.glExts.end()) {
wglSwapIntervalEXT = (PWSWAPINTERVALEXTPROC) SDL_GL_GetProcAddress("wglSwapIntervalEXT");
if(wglSwapIntervalEXT)
LOG->Trace("Got wglSwapIntervalEXT");
}
/* Check for extensions: */
m_oglspecs->EXT_texture_env_combine = HasExtension("GL_EXT_texture_env_combine");
m_oglspecs->ARB_texture_compression = HasExtension("GL_ARB_texture_compression");
m_oglspecs->EXT_texture_compression_s3tc = HasExtension("GL_EXT_texture_compression_s3tc");
m_oglspecs->WGL_EXT_swap_control = HasExtension("WGL_EXT_swap_control");
/* Find extension functions. */
wglSwapIntervalEXT = (PWSWAPINTERVALEXTPROC) SDL_GL_GetProcAddress("wglSwapIntervalEXT");
/* Make sure we have all components for detected extensions. */
if(m_oglspecs->WGL_EXT_swap_control)
ASSERT(wglSwapIntervalEXT);
}
/* Set the video mode. In some cases, changing the video mode will reset
@@ -250,7 +231,7 @@ bool RageDisplay::SetVideoMode( bool windowed, int width, int height, int bpp, i
/* Set vsync the Windows way, if we can. (What other extensions are there
* to do this, for other archs?) */
if(wglSwapIntervalEXT) {
if(m_oglspecs->WGL_EXT_swap_control) {
wglSwapIntervalEXT(vsync);
}
@@ -396,8 +377,8 @@ void RageDisplay::DrawLoop( const RageVertex v[], int iNumVerts, float LineWidth
/* Clamp the width to the hardware max for both lines and points (whichever
* is more restrictive). */
LineWidth = clamp(LineWidth, g_oglspecs.line_range[0], g_oglspecs.line_range[1]);
LineWidth = clamp(LineWidth, g_oglspecs.point_range[0], g_oglspecs.point_range[1]);
LineWidth = clamp(LineWidth, m_oglspecs->line_range[0], m_oglspecs->line_range[1]);
LineWidth = clamp(LineWidth, m_oglspecs->point_range[0], m_oglspecs->point_range[1]);
/* Hmm. The granularity of lines and points might be different; for example,
* if lines are .5 and points are .25, we might want to snap the width to the
@@ -695,7 +676,7 @@ void RageDisplay::SetTextureModeGlow()
{
FlushQueue();
if(!g_oglspecs.EXT_texture_env_combine) {
if(!m_oglspecs->EXT_texture_env_combine) {
SetBlendMode( GL_SRC_ALPHA, GL_ONE );
return;
}
stepmania/src/RageDisplay.h
+6
View File
@@ -19,6 +19,7 @@ struct RageVertex;
#include "RageTypes.h"
const int REFRESH_DEFAULT = 0;
struct oglspecs_t;
class RageDisplay
{
@@ -84,12 +85,17 @@ public:
int GetDPF() const;
void ResetStats();
const oglspecs_t &GetSpecs() const { return *m_oglspecs; }
protected:
void AddVerts( const RageVertex v[], int iNumVerts );
void SetBlendMode(int src, int dst);
void SetupOpenGL();
void SetupExtensions();
void SetViewport(int shift_left, int shift_down);
oglspecs_t *m_oglspecs;
/* Don't use this to check extensions; use GetSpecs. */
bool HasExtension(CString ext) const;
};
stepmania/src/RageDisplayInternal.h
+64
View File
@@ -0,0 +1,64 @@
#ifndef RAGE_DISPLAY_INTERNAL_H
#define RAGE_DISPLAY_INTERNAL_H
/*
* This header pulls in GL headers and defines things that require them.
* This only needs to be included if you actually use these; most of the
* time, RageDisplay.h is sufficient.
*/
#include "SDL.h"
/* ours is more up-to-date */
#define NO_SDL_GLEXT
#define __glext_h_ /* try harder to stop glext.h from being forced on us by someone else */
#include "SDL_opengl.h"
#include "glext.h"
#include <set>
/* Not in glext.h: */
typedef BOOL (APIENTRY * PWSWAPINTERVALEXTPROC) (int interval);
struct oglspecs_t {
/* OpenGL system information that generally doesn't change at runtime. */
/* Range and granularity of points and lines: */
float line_range[2];
float line_granularity;
float point_range[2];
float point_granularity;
/* OpenGL version * 10: */
int glVersion;
/* Available extensions: */
set<string> glExts;
/* Which extensions we actually use are supported: */
bool EXT_texture_env_combine,
WGL_EXT_swap_control,
ARB_texture_compression,
EXT_texture_compression_s3tc;
};
/* Extension functions we use. Put these in a namespace instead of in oglspecs_t,
* so they can be called like regular functions. */
namespace GLExt {
PWSWAPINTERVALEXTPROC wglSwapIntervalEXT;
};
using namespace GLExt;
#endif
/*
-----------------------------------------------------------------------------
Class: RageDisplay
Desc: See header.
Copyright (c) 2001-2002 by the person(s) listed below. All rights reserved.
Glenn Maynard
Chris Danford
-----------------------------------------------------------------------------
*/