preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-13 09:39:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #103 from jtraynham/master

Browse Source 
Fix for iOS build errors
This commit is contained in:
Unknown W. Brackets committed 2013-08-02 16:21:46 -07:00
2 parents 9ae2e857f8 adee7f9c90
commit 55897ffde0
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
gfx_es2/gl_state.cpp
+4 -4
View File
@@ -4,7 +4,7 @@
#include "GL/wglew.h"
#endif
#if defined(USING_GLES2)
#if defined(USING_GLES2)
#if defined(ANDROID)
PFNGLALPHAFUNCQCOMPROC glAlphaFuncQCOM;
PFNEGLGETSYSTEMTIMEFREQUENCYNVPROC eglGetSystemTimeFrequencyNV;
@@ -59,7 +59,7 @@ void OpenGLState::Restore() {
stencilFunc.restore(); count++;
dither.restore(); count++;
if (count != state_count) {
FLOG("OpenGLState::Restore is missing some states");
}
@@ -91,7 +91,7 @@ void CheckGLExtensions() {
gl_extensions.OES_depth_texture = strstr(extString, "GL_OES_depth_texture") != 0;
gl_extensions.OES_mapbuffer = strstr(extString, "GL_OES_mapbuffer") != 0;
#if defined(__SYMBIAN32__) || defined(MEEGO_EDITION_HARMATTAN)
#if defined(IOS) || defined(__SYMBIAN32__) || defined(MEEGO_EDITION_HARMATTAN)
gl_extensions.OES_vertex_array_object = false;
gl_extensions.EXT_discard_framebuffer = false;
#else
@@ -120,7 +120,7 @@ void CheckGLExtensions() {
// Look for EGL extensions
EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
const char *eglString = eglQueryString(display, EGL_EXTENSIONS);
gl_extensions.EGL_NV_system_time = strstr(eglString, "EGL_NV_system_time") != 0;