thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRIM: Clean up the code a bit. Remove Win32 specific extension loading code since only the SDL backend is officially supported right now.

Browse source
This commit is contained in:
Joni Vähämäki 2011-05-20 02:33:52 +08:00 • committed by Pawel Kolodziejski
parent 0203caa427
commit 67487b8667
2 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engines/grim/gfx_opengl.cpp
View file

@ -44,14 +44,9 @@
#include "engines/grim/bitmap.h"
#include "engines/grim/primitives.h"
#if defined(SDL_BACKEND) || defined(WIN32)
#if defined(SDL_BACKEND)
// Extension functions needed for fragment programs.
typedef void (APIENTRY *PFNGLGENPROGRAMSARBPROC) (GLsizei n, GLuint *programs);
typedef void (APIENTRY *PFNGLBINDPROGRAMARBPROC) (GLenum target, GLuint program);
typedef void (APIENTRY *PFNGLPROGRAMSTRINGARBPROC) (GLenum target, GLenum format, GLsizei len, const GLvoid *string);
typedef void (APIENTRY *PFNGLDELETEPROGRAMSARBPROC) (GLsizei n, const GLuint *programs);
PFNGLGENPROGRAMSARBPROC glGenProgramsARB;
PFNGLBINDPROGRAMARBPROC glBindProgramARB;
PFNGLPROGRAMSTRINGARBPROC glProgramStringARB;
@ -119,8 +114,7 @@ byte *GfxOpenGL::setupScreen(int screenW, int screenH, bool fullscreen) {
void GfxOpenGL::initExtensions()
{
#ifdef GL_ARB_fragment_program
#ifdef SDL_BACKEND
#if defined (SDL_BACKEND) && defined(GL_ARB_fragment_program)
union {
void* obj_ptr;
void (APIENTRY *func_ptr)();
@ -133,12 +127,6 @@ void GfxOpenGL::initExtensions()
glProgramStringARB = (PFNGLPROGRAMSTRINGARBPROC)u.func_ptr;
u.obj_ptr = SDL_GL_GetProcAddress("glDeleteProgramsARB");
glDeleteProgramsARB = (PFNGLDELETEPROGRAMSARBPROC)u.func_ptr;
#elif defined(WIN32)
glGenProgramsARB = (PFNGLGENPROGRAMSARBPROC)wglGetProcAddress("glGenProgramsARB");
glBindProgramARB = (PFNGLBINDPROGRAMARBPROC)wglGetProcAddress("glBindProgramARB");
glProgramStringARB = (PFNGLPROGRAMSTRINGARBPROC)wglGetProcAddress("glProgramStringARB");
glDeleteProgramsARB = (PFNGLDELETEPROGRAMSARBPROC)wglGetProcAddress("glDeleteProgramsARB");
#endif
const char* extensions = (const char*)glGetString(GL_EXTENSIONS);
if (strstr(extensions, "ARB_fragment_program")) {