diff options
| author | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-11 08:06:31 +0800 |
|---|---|---|
| committer | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-11 08:06:31 +0800 |
| commit | 291d7992ceae487a63dc2d6eb1ee2da7312017c5 (patch) | |
| tree | 6bd0489107fa33477ccc7e7553c79d3001fe433a /platform/x11/os_x11.cpp | |
| parent | a8e3c5c0b7fb202bcceb06b9373b5b6a4ff8f9b8 (diff) | |
| parent | d30f4e52f654a26e14223a6ef9a946cc6282c0db (diff) | |
Merge branch 'master' into x11-fullscreen
Diffstat (limited to 'platform/x11/os_x11.cpp')
| -rw-r--r-- | platform/x11/os_x11.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 9e02f54dd4..5a05455918 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -28,7 +28,6 @@ /*************************************************************************/ #include "servers/visual/visual_server_raster.h" #include "drivers/gles2/rasterizer_gles2.h" -#include "drivers/gles1/rasterizer_gles1.h" #include "os_x11.h" #include "key_mapping_x11.h" #include <stdio.h> @@ -63,11 +62,11 @@ int OS_X11::get_video_driver_count() const { - return 2; + return 1; } const char * OS_X11::get_video_driver_name(int p_driver) const { - return p_driver==0?"GLES2":"GLES1"; + return "GLES2"; } OS::VideoMode OS_X11::get_default_video_mode() const { @@ -178,10 +177,10 @@ void OS_X11::initialize(const VideoMode& p_desired,int p_video_driver,int p_audi context_gl = memnew( ContextGL_X11( x11_display, x11_window,current_videomode, false ) ); context_gl->initialize(); - if (p_video_driver == 0) { + if (true) { rasterizer = memnew( RasterizerGLES2 ); } else { - rasterizer = memnew( RasterizerGLES1 ); + //rasterizer = memnew( RasterizerGLES1 ); }; #endif |