teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2025-02-14 16:10:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make context create correctly

Browse source
This commit is contained in:
Simon 2022-03-25 19:34:44 +00:00
parent e1a04d2200
commit b2fece761e
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
android/app/src/main/cpp/code/sdl/sdl_glimp.c
View file

@ -589,6 +589,7 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qbool
SDL_GL_SetAttribute( SDL_GL_MULTISAMPLEBUFFERS, samples ? 1 : 0 ); SDL_GL_SetAttribute( SDL_GL_MULTISAMPLEBUFFERS, samples ? 1 : 0 );
SDL_GL_SetAttribute( SDL_GL_MULTISAMPLESAMPLES, samples ); SDL_GL_SetAttribute( SDL_GL_MULTISAMPLESAMPLES, samples );
#if 0
if(r_stereoEnabled->integer) if(r_stereoEnabled->integer)
{ {
glConfig.stereoEnabled = qtrue; glConfig.stereoEnabled = qtrue;
@ -602,7 +603,7 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qbool
SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 ); SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
#if 0 // if multisampling is enabled on X11, this causes create window to fail. // if multisampling is enabled on X11, this causes create window to fail.
// If not allowing software GL, demand accelerated // If not allowing software GL, demand accelerated
if( !r_allowSoftwareGL->integer ) if( !r_allowSoftwareGL->integer )
SDL_GL_SetAttribute( SDL_GL_ACCELERATED_VISUAL, 1 ); SDL_GL_SetAttribute( SDL_GL_ACCELERATED_VISUAL, 1 );
@ -615,7 +616,7 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qbool
continue; continue;
} }
if( fullscreen ) if( qfalse ) //fullscreen )
{ {
SDL_DisplayMode mode; SDL_DisplayMode mode;
@ -638,7 +639,7 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qbool
} }
} }
SDL_SetWindowIcon( SDL_window, icon ); //SDL_SetWindowIcon( SDL_window, icon );
if (!fixedFunction) if (!fixedFunction)
{ {
@ -648,7 +649,7 @@ static int GLimp_SetMode(int mode, qboolean fullscreen, qboolean noborder, qbool
SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minorVersion); SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minorVersion);
ri.Printf(PRINT_ALL, "Trying to get an OpenGL 3.2 core context\n"); ri.Printf(PRINT_ALL, "Trying to get an OpenGL 3.2 core context\n");
SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_CORE); SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, SDL_GL_CONTEXT_PROFILE_ES);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2); SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 2);
if ((SDL_glContext = SDL_GL_CreateContext(SDL_window)) == NULL) if ((SDL_glContext = SDL_GL_CreateContext(SDL_window)) == NULL)

2
android/app/src/main/cpp/main.cpp
View file

@ -73,7 +73,7 @@ int main(int argc, char* argv[]) {
engine_t* engine = nullptr; engine_t* engine = nullptr;
engine = VR_Init(java); engine = VR_Init(java);
//sleep(30); sleep(30);
//First set up resolution cached values //First set up resolution cached values
int width, height; int width, height;