From fc1f8291d6eb78dde6266a45032adf5b887e54a5 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Tue, 31 Dec 2013 22:33:55 -0600 Subject: [PATCH] [GLExtensions] Make sure to initialize our function pointers with VideoSoftware as well. --- Source/Core/VideoBackends/Software/CMakeLists.txt | 3 ++- Source/Core/VideoBackends/Software/SWmain.cpp | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoBackends/Software/CMakeLists.txt b/Source/Core/VideoBackends/Software/CMakeLists.txt index 9f95aab7ef..14f7a8c617 100644 --- a/Source/Core/VideoBackends/Software/CMakeLists.txt +++ b/Source/Core/VideoBackends/Software/CMakeLists.txt @@ -1,4 +1,5 @@ -set(SRCS BPMemLoader.cpp +set(SRCS ../OGL/GLExtensions/GLExtensions.cpp + BPMemLoader.cpp Clipper.cpp SWCommandProcessor.cpp CPMemLoader.cpp diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 0fe7a28488..ed868070e7 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -9,7 +9,7 @@ #include "VideoConfigDialog.h" #endif // HAVE_WX - +#include "../OGL/GLExtensions/GLExtensions.h" #include "SWCommandProcessor.h" #include "OpcodeDecoder.h" #include "SWVideoConfig.h" @@ -168,6 +168,14 @@ void VideoSoftware::Video_Cleanup() void VideoSoftware::Video_Prepare() { 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 GLInterface->SwapInterval(VSYNC_ENABLED);