Merge pull request #27840 from ZhilkinSerg/android-graphics-options

Fix crashes in Android builds
CleverRaven · Jan 25, 2019 · 28c87d1 · 28c87d1
2 parents 0525397 + 05e443d
commit 28c87d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/debug_menu.cpp b/src/debug_menu.cpp
@@ -630,7 +630,11 @@ void draw_benchmark( const int max_difference )
                                "\n| USE_TILES |  RENDERER | FRAMEBUFFER_ACCEL | USE_COLOR_MODULATED_TEXTURES | FPS |" <<
                                "\n|:---:|:---:|:---:|:---:|:---:|\n| " <<
                                get_option<bool>( "USE_TILES" ) << " | " <<
+#ifndef __ANDROID__
                                get_option<std::string>( "RENDERER" ) << " | " <<
+#else
+                               get_option<bool>( "SOFTWARE_RENDERING" ) << " | " <<
+#endif
                                get_option<bool>( "FRAMEBUFFER_ACCEL" ) << " | " <<
                                get_option<bool>( "USE_COLOR_MODULATED_TEXTURES" ) << " | " <<
                                int( 1000.0 * draw_counter / ( double )difference ) << " |\n";

diff --git a/src/sdltiles.cpp b/src/sdltiles.cpp
@@ -399,6 +399,7 @@ void WinCreate()
     format.reset( SDL_AllocFormat( wformat ) );
     throwErrorIf( !format, "SDL_AllocFormat failed" );
 
+#ifndef __ANDROID__
     bool software_renderer = get_option<std::string>( "RENDERER" ).empty();
     int renderer_id = -1;
     std::string renderer_name;
@@ -418,6 +419,9 @@ void WinCreate()
             break;
         }
     }
+#else
+    bool software_renderer = get_option<bool>( "SOFTWARE_RENDERING" );
+#endif
 
     if( !software_renderer ) {
         dbg( D_INFO ) << "Attempting to initialize accelerated SDL renderer.";