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

Merge pull request #1046 from cxd4/fix-glitch64-GL-extensions 

[Glitch64] Fix missing GL extension prototypes on non-ES, non-WIN32 systems.
This commit is contained in:
zilmar 2016-03-27 07:34:00 +11:00
parent 7b93904d0c 3f02994b18
commit 512a5978ad
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Glitch64/OGLtextures.cpp
View File

@ -50,7 +50,7 @@ typedef struct _texlist
static int nbTex = 0; static int nbTex = 0;
static texlist *list = NULL; static texlist *list = NULL;
#ifdef _WIN32 #if !defined(__ANDROID__) && !defined(ANDROID)
extern PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT; extern PFNGLDELETERENDERBUFFERSEXTPROC glDeleteRenderbuffersEXT;
extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT; extern PFNGLDELETEFRAMEBUFFERSEXTPROC glDeleteFramebuffersEXT;
extern PFNGLCOMPRESSEDTEXIMAGE2DARBPROC glCompressedTexImage2DARB; extern PFNGLCOMPRESSEDTEXIMAGE2DARBPROC glCompressedTexImage2DARB;

19
Source/Glitch64/glitchmain.h
View File

@ -46,10 +46,21 @@ extern int buffer_cleared; // mark that the buffer has been cleared, used to che
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC)(HDC hdc);
#else
#include <stdio.h>
#endif
#if defined(__ANDROID__) || defined(ANDROID)
#include "OGLESwrappers.h"
#else
#include "opengl.h" #include "opengl.h"
extern "C" { extern "C" {
#ifndef GL_VERSION_1_3
extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB; extern PFNGLACTIVETEXTUREARBPROC glActiveTextureARB;
extern PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB;
#endif
extern PFNGLATTACHOBJECTARBPROC glAttachObjectARB; extern PFNGLATTACHOBJECTARBPROC glAttachObjectARB;
extern PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT; extern PFNGLBINDFRAMEBUFFEREXTPROC glBindFramebufferEXT;
extern PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT; extern PFNGLBINDRENDERBUFFEREXTPROC glBindRenderbufferEXT;
@ -69,7 +80,6 @@ extern "C" {
extern PFNGLGETOBJECTPARAMETERIVARBPROC glGetObjectParameterivARB; extern PFNGLGETOBJECTPARAMETERIVARBPROC glGetObjectParameterivARB;
extern PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB; extern PFNGLGETUNIFORMLOCATIONARBPROC glGetUniformLocationARB;
extern PFNGLLINKPROGRAMARBPROC glLinkProgramARB; extern PFNGLLINKPROGRAMARBPROC glLinkProgramARB;
extern PFNGLMULTITEXCOORD2FARBPROC glMultiTexCoord2fARB;
extern PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT; extern PFNGLRENDERBUFFERSTORAGEEXTPROC glRenderbufferStorageEXT;
extern PFNGLSECONDARYCOLOR3FPROC glSecondaryColor3f; extern PFNGLSECONDARYCOLOR3FPROC glSecondaryColor3f;
extern PFNGLSHADERSOURCEARBPROC glShaderSourceARB; extern PFNGLSHADERSOURCEARBPROC glShaderSourceARB;
@ -78,12 +88,9 @@ extern "C" {
extern PFNGLUNIFORM4FARBPROC glUniform4fARB; extern PFNGLUNIFORM4FARBPROC glUniform4fARB;
extern PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB; extern PFNGLUSEPROGRAMOBJECTARBPROC glUseProgramObjectARB;
extern PFNGLGETHANDLEARBPROC glGetHandleARB; extern PFNGLGETHANDLEARBPROC glGetHandleARB;
typedef const char * (WINAPI * PFNWGLGETEXTENSIONSSTRINGARBPROC) (HDC hdc);
} }
#else #endif
#include <stdio.h>
#include "OGLESwrappers.h"
#endif // _WIN32
#include "glide.h" #include "glide.h"
void init_geometry(); void init_geometry();