ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved some OpenGL init code around in the FramebufferGL class. This fixes 

the annoying flashing that was happening in Linux.  Hopefully it will fix
the Windows GL code as well ...


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@234 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2004-04-15 21:27:31 +00:00
parent fa5d1f97ac
commit 0591a92fa7
1 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
stella/src/ui/sdl/FrameBufferGL.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: FrameBufferGL.cxx,v 1.15 2004-04-12 23:28:42 stephena Exp $ // $Id: FrameBufferGL.cxx,v 1.16 2004-04-15 21:27:31 stephena Exp $
//============================================================================ //============================================================================
#include <SDL.h> #include <SDL.h>
@ -47,6 +47,12 @@ FrameBufferGL::~FrameBufferGL()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool FrameBufferGL::createScreen() bool FrameBufferGL::createScreen()
{ {
SDL_GL_SetAttribute( SDL_GL_RED_SIZE, myRGB[0] );
SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, myRGB[1] );
SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, myRGB[2] );
SDL_GL_SetAttribute( SDL_GL_ALPHA_SIZE, myRGB[3] );
SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
GLint viewportX = 0, viewportY = 0; GLint viewportX = 0, viewportY = 0;
uInt32 screenWidth = 0; uInt32 screenWidth = 0;
uInt32 screenHeight = 0; uInt32 screenHeight = 0;
@ -63,8 +69,8 @@ bool FrameBufferGL::createScreen()
viewportX = rect.x; viewportX = rect.x;
viewportY = rect.y; viewportY = rect.y;
screenWidth = rect.w; screenWidth = rect.w - 1;
screenHeight = rect.h; screenHeight = rect.h - 1;
} }
else else
{ {
@ -98,13 +104,6 @@ bool FrameBufferGL::createScreen()
#ifdef TEXTURES_ARE_LOST #ifdef TEXTURES_ARE_LOST
createTextures(); createTextures();
glDisable(GL_DEPTH_TEST);
glDisable(GL_CULL_FACE);
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_TEXTURE_2D);
#endif #endif
// Make sure any old parts of the screen are erased // Make sure any old parts of the screen are erased
@ -199,11 +198,6 @@ bool FrameBufferGL::init()
default: // This should never happen default: // This should never happen
break; break;
} }
SDL_GL_SetAttribute( SDL_GL_RED_SIZE, myRGB[0] );
SDL_GL_SetAttribute( SDL_GL_GREEN_SIZE, myRGB[1] );
SDL_GL_SetAttribute( SDL_GL_BLUE_SIZE, myRGB[2] );
SDL_GL_SetAttribute( SDL_GL_ALPHA_SIZE, myRGB[3] );
SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
// Create the screen // Create the screen
if(!createScreen()) if(!createScreen())
@ -256,14 +250,6 @@ bool FrameBufferGL::init()
showCursor(!theHideCursorIndicator); showCursor(!theHideCursorIndicator);
} }
// Set up global GL stuff
glDisable(GL_DEPTH_TEST);
glDisable(GL_CULL_FACE);
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_TEXTURE_2D);
return true; return true;
} }
@ -467,6 +453,13 @@ bool FrameBufferGL::createTextures()
SDL_FreeSurface(fontTexture); SDL_FreeSurface(fontTexture);
glDisable(GL_DEPTH_TEST);
glDisable(GL_CULL_FACE);
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_TEXTURE_2D);
return true; return true;
} }
@ -520,7 +513,7 @@ SDL_Rect FrameBufferGL::viewport(uInt32 width, uInt32 height)
// List of valid fullscreen OpenGL modes // List of valid fullscreen OpenGL modes
Screenmode myScreenmode[6] = { Screenmode myScreenmode[6] = {
{320, 200 }, {320, 240 },
{640, 480 }, {640, 480 },
{800, 600 }, {800, 600 },
{1024, 768 }, {1024, 768 },