ioquake/ioq3
0
0
Fork 0
mirror of https://github.com/ioquake/ioq3.git synced 2024-11-10 07:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support parsing OpenGL ES version strings

Browse source 
The renderers don't support OpenGL ES though.
This commit is contained in:
Zack Middleton 2017-10-01 22:53:21 -05:00
parent c9d12aa3f3
commit da07a6dbd9
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/renderercommon/qgl.h
View file

@ -306,6 +306,8 @@ QGL_EXT_direct_state_access_PROCS;
#undef GLE #undef GLE
extern int qglMajorVersion, qglMinorVersion; extern int qglMajorVersion, qglMinorVersion;
extern int qglesMajorVersion, qglesMinorVersion;
#define QGL_VERSION_ATLEAST( major, minor ) ( qglMajorVersion > major || ( qglMajorVersion == major && qglMinorVersion >= minor ) ) #define QGL_VERSION_ATLEAST( major, minor ) ( qglMajorVersion > major || ( qglMajorVersion == major && qglMinorVersion >= minor ) )
#define QGLES_VERSION_ATLEAST( major, minor ) ( qglesMajorVersion > major || ( qglesMajorVersion == major && qglesMinorVersion >= minor ) )
#endif #endif

22
code/sdl/sdl_glimp.c
View file

@ -54,6 +54,7 @@ cvar_t *r_centerWindow;
cvar_t *r_sdlDriver; cvar_t *r_sdlDriver;
int qglMajorVersion, qglMinorVersion; int qglMajorVersion, qglMinorVersion;
int qglesMajorVersion, qglesMinorVersion;
void (APIENTRYP qglActiveTextureARB) (GLenum texture); void (APIENTRYP qglActiveTextureARB) (GLenum texture);
void (APIENTRYP qglClientActiveTextureARB) (GLenum texture); void (APIENTRYP qglClientActiveTextureARB) (GLenum texture);
@ -239,7 +240,7 @@ static qboolean GLimp_GetProcAddresses( void ) {
} }
#endif #endif
// OpenGL 1.0 // OpenGL 1.0 and OpenGL ES 1.0
GLE(const GLubyte *, GetString, GLenum name) GLE(const GLubyte *, GetString, GLenum name)
if ( !qglGetString ) { if ( !qglGetString ) {
@ -252,17 +253,28 @@ static qboolean GLimp_GetProcAddresses( void ) {
Com_Error( ERR_FATAL, "GL_VERSION is NULL\n" ); Com_Error( ERR_FATAL, "GL_VERSION is NULL\n" );
} }
if ( Q_stricmpn( "OpenGL ES", version, 9 ) == 0 ) {
char profile[6]; // ES, ES-CM, or ES-CL
sscanf( version, "OpenGL %5s %d.%d", profile, &qglesMajorVersion, &qglesMinorVersion );
// common lite profile (no floating point) is not supported
if ( Q_stricmp( profile, "ES-CL" ) == 0 ) {
qglesMajorVersion = 0;
qglesMinorVersion = 0;
}
} else {
sscanf( version, "%d.%d", &qglMajorVersion, &qglMinorVersion ); sscanf( version, "%d.%d", &qglMajorVersion, &qglMinorVersion );
}
// require OpenGL 1.1 // require OpenGL 1.1 or OpenGL ES 1.0
if ( QGL_VERSION_ATLEAST( 1, 1 ) ) { // FIXME: Not all of these functions are available in OpenGL ES
if ( QGL_VERSION_ATLEAST( 1, 1 ) /*|| QGLES_VERSION_ATLEAST( 1, 0 )*/ ) {
QGL_1_0_PROCS; QGL_1_0_PROCS;
QGL_1_1_PROCS; QGL_1_1_PROCS;
} else { } else {
Com_Error( ERR_FATAL, "Unsupported OpenGL Version: %s\n", version ); Com_Error( ERR_FATAL, "Unsupported OpenGL Version: %s\n", version );
} }
if ( QGL_VERSION_ATLEAST( 3, 0 ) ) { if ( QGL_VERSION_ATLEAST( 3, 0 ) || QGLES_VERSION_ATLEAST( 3, 0 ) ) {
QGL_3_0_PROCS; QGL_3_0_PROCS;
} }
@ -283,6 +295,8 @@ static void GLimp_ClearProcAddresses( void ) {
qglMajorVersion = 0; qglMajorVersion = 0;
qglMinorVersion = 0; qglMinorVersion = 0;
qglesMajorVersion = 0;
qglesMinorVersion = 0;
QGL_1_0_PROCS; QGL_1_0_PROCS;
QGL_1_1_PROCS; QGL_1_1_PROCS;