MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upgrade to GRAPHICS_API_OPENGL_ES3

Browse Source
This commit is contained in:
blueloveTH 2024-03-25 01:40:26 +08:00
parent 3a9649d397
commit 67fb284c1a
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
projects/Xcode15/raylib.xcodeproj/project.pbxproj
View File

@ -343,8 +343,9 @@
GCC_C_LANGUAGE_STANDARD = gnu17; GCC_C_LANGUAGE_STANDARD = gnu17;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1", "DEBUG=1",
GRAPHICS_API_OPENGL_ES2, GRAPHICS_API_OPENGL_ES3,
PLATFORM_IOS, PLATFORM_IOS,
GL_GLEXT_PROTOTYPES,
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
@ -362,7 +363,9 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
LIBRARY_SEARCH_PATHS = "";
MARKETING_VERSION = 1.0; MARKETING_VERSION = 1.0;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = com.example.raylib; PRODUCT_BUNDLE_IDENTIFIER = com.example.raylib;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
@ -385,8 +388,9 @@
DEVELOPMENT_TEAM = A7A93GC9AY; DEVELOPMENT_TEAM = A7A93GC9AY;
GCC_C_LANGUAGE_STANDARD = gnu17; GCC_C_LANGUAGE_STANDARD = gnu17;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
GRAPHICS_API_OPENGL_ES2, GRAPHICS_API_OPENGL_ES3,
PLATFORM_IOS, PLATFORM_IOS,
GL_GLEXT_PROTOTYPES,
); );
GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES;
@ -404,7 +408,9 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
LIBRARY_SEARCH_PATHS = "";
MARKETING_VERSION = 1.0; MARKETING_VERSION = 1.0;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = com.example.raylib; PRODUCT_BUNDLE_IDENTIFIER = com.example.raylib;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;

13
src/platforms/rcore_ios.c
View File

@ -506,18 +506,11 @@ int InitPlatform(void)
EGL_SAMPLES, samples, // 4x Antialiasing if activated (Free on MALI GPUs) EGL_SAMPLES, samples, // 4x Antialiasing if activated (Free on MALI GPUs)
EGL_NONE EGL_NONE
}; };
// const EGLint contextAttribs[] =
// {
// EGL_CONTEXT_CLIENT_VERSION, 2,
// EGL_NONE
// };
const EGLint contextAttribs[] = const EGLint contextAttribs[] =
{ {
EGL_CONTEXT_MAJOR_VERSION, 2, EGL_CONTEXT_CLIENT_VERSION, 3,
EGL_CONTEXT_MINOR_VERSION, 0, EGL_NONE
EGL_NONE,
}; };
EGLint numConfigs = 0; EGLint numConfigs = 0;
@ -584,6 +577,8 @@ int InitPlatform(void)
TRACELOG(LOG_INFO, " > Screen size: %i x %i", CORE.Window.screen.width, CORE.Window.screen.height); TRACELOG(LOG_INFO, " > Screen size: %i x %i", CORE.Window.screen.width, CORE.Window.screen.height);
TRACELOG(LOG_INFO, " > Render size: %i x %i", CORE.Window.render.width, CORE.Window.render.height); TRACELOG(LOG_INFO, " > Render size: %i x %i", CORE.Window.render.width, CORE.Window.render.height);
TRACELOG(LOG_INFO, " > Viewport offsets: %i, %i", CORE.Window.renderOffset.x, CORE.Window.renderOffset.y); TRACELOG(LOG_INFO, " > Viewport offsets: %i, %i", CORE.Window.renderOffset.x, CORE.Window.renderOffset.y);
TRACELOG(LOG_WARNING, " > GL: %s", glGetString(GL_VERSION));
TRACELOG(LOG_WARNING, " > EGL: %s", eglQueryString(platform.device, EGL_VERSION));
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// Load OpenGL extensions // Load OpenGL extensions

5
src/rlgl.h
View File

@ -816,12 +816,13 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad
#endif #endif
#if defined(PLATFORM_IOS) #if defined(PLATFORM_IOS)
#ifndef GRAPHICS_API_OPENGL_ES2 #ifndef GRAPHICS_API_OPENGL_ES3
#error "GRAPHICS_API_OPENGL_ES2 required on PLATFORM_IOS" #error "GRAPHICS_API_OPENGL_ES3 required on PLATFORM_IOS"
#endif #endif
#include "libGLESv2/GLES/glext.h" #include "libGLESv2/GLES/glext.h"
#include "libGLESv2/GLES2/gl2.h" #include "libGLESv2/GLES2/gl2.h"
#include "libGLESv2/GLES2/gl2ext.h" // OpenGL ES 2.0 extensions library #include "libGLESv2/GLES2/gl2ext.h" // OpenGL ES 2.0 extensions library
#include "libGLESv2/GLES3/gl3.h"
#elif defined(GRAPHICS_API_OPENGL_ES3) #elif defined(GRAPHICS_API_OPENGL_ES3)
#include <GLES3/gl3.h> // OpenGL ES 3.0 library #include <GLES3/gl3.h> // OpenGL ES 3.0 library
#define GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES