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

[GLExtensions] Make sure to initialize our function pointers with VideoSoftware as well.

This commit is contained in:
Ryan Houdek 2013-12-31 22:33:55 -06:00 committed by degasus
parent eba0c21b5a
commit fc1f8291d6
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/VideoBackends/Software/CMakeLists.txt
View File

@ -1,4 +1,5 @@
set(SRCS BPMemLoader.cpp set(SRCS ../OGL/GLExtensions/GLExtensions.cpp
BPMemLoader.cpp
Clipper.cpp Clipper.cpp
SWCommandProcessor.cpp SWCommandProcessor.cpp
CPMemLoader.cpp CPMemLoader.cpp

10
Source/Core/VideoBackends/Software/SWmain.cpp
View File

@ -9,7 +9,7 @@
#include "VideoConfigDialog.h" #include "VideoConfigDialog.h"
#endif // HAVE_WX #endif // HAVE_WX
#include "../OGL/GLExtensions/GLExtensions.h"
#include "SWCommandProcessor.h" #include "SWCommandProcessor.h"
#include "OpcodeDecoder.h" #include "OpcodeDecoder.h"
#include "SWVideoConfig.h" #include "SWVideoConfig.h"
@ -168,6 +168,14 @@ void VideoSoftware::Video_Cleanup()
void VideoSoftware::Video_Prepare() void VideoSoftware::Video_Prepare()
{ {
GLInterface->MakeCurrent(); GLInterface->MakeCurrent();
// Init extension support.
if (!GLExtensions::Init())
{
ERROR_LOG(VIDEO, "GLExtensions::Init failed!Does your video card support OpenGL 2.0?");
return;
}
// Handle VSync on/off // Handle VSync on/off
GLInterface->SwapInterval(VSYNC_ENABLED); GLInterface->SwapInterval(VSYNC_ENABLED);