Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-25 18:39:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix unused variable warning.

Browse Source
This commit is contained in:
Relintai 2022-03-16 09:24:09 +01:00
parent 467a2885d1
commit 0edcb0e374
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
platform/x11/os_x11.cpp
View File

@ -36,9 +36,9 @@
#include "drivers/gles2/rasterizer_gles2.h" #include "drivers/gles2/rasterizer_gles2.h"
#include "key_mapping_x11.h" #include "key_mapping_x11.h"
#include "main/main.h" #include "main/main.h"
#include "scene/resources/texture.h"
#include "servers/visual/visual_server_raster.h" #include "servers/visual/visual_server_raster.h"
#include "servers/visual/visual_server_wrap_mt.h" #include "servers/visual/visual_server_wrap_mt.h"
#include "scene/resources/texture.h"
#ifdef HAVE_MNTENT #ifdef HAVE_MNTENT
#include <mntent.h> #include <mntent.h>
@ -308,7 +308,8 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
// opengl_api_type = ContextGL_X11::GLES_2_0_COMPATIBLE; // opengl_api_type = ContextGL_X11::GLES_2_0_COMPATIBLE;
//} //}
bool editor = Engine::get_singleton()->is_editor_hint(); //bool editor = Engine::get_singleton()->is_editor_hint();
//p_video_driver = VIDEO_DRIVER_GLES2;
bool gl_initialization_error = false; bool gl_initialization_error = false;
context_gl = nullptr; context_gl = nullptr;
@ -319,19 +320,9 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
memdelete(context_gl); memdelete(context_gl);
context_gl = nullptr; context_gl = nullptr;
if (GLOBAL_GET("rendering/quality/driver/fallback_to_gles2") || editor) {
if (p_video_driver == VIDEO_DRIVER_GLES2) {
gl_initialization_error = true; gl_initialization_error = true;
break; break;
} }
p_video_driver = VIDEO_DRIVER_GLES2;
opengl_api_type = ContextGL_X11::GLES_2_0_COMPATIBLE;
} else {
gl_initialization_error = true;
break;
}
}
} }
while (true) { while (true) {