render: exclude filters compilation for android

Author: dalerank

CMakeLists.txt

@@ -166,7 +166,12 @@ add_subdirectory(ext/png)
 add_subdirectory(ext/expat)
 add_subdirectory(ext/mujs)
 add_subdirectory(ext/lame)
-add_subdirectory(ext/gpupixel)
+
+if (CMAKE_BUILD_PLATFORM STREQUAL "android")
+   # no filters on android
+else()
+    add_subdirectory(ext/gpupixel)
+endif()
 
 file(GLOB PLATFORM_FILES ${PROJECT_SOURCE_DIR}/src/platform/*.cpp)
 file(GLOB CONFIG_FILES ${PROJECT_SOURCE_DIR}/src/config/*.cpp)
@@ -473,7 +478,13 @@ include_directories(${EXTPNG_INCLUDE_DIR})
 include_directories(${EXTMUJS_INCLUDE_DIR})
 include_directories(${CMRC_INCLUDE_DIR})
 include_directories(${EXTLAME_INCLUDE_DIR})
-include_directories(${GPUPIXEL_INCLUDE_DIR})
+
+if (CMAKE_BUILD_PLATFORM STREQUAL "android")
+   # no filters on android
+   set(GPUPIXEL_LIBRARY "")
+else()
+    include_directories(${GPUPIXEL_INCLUDE_DIR})
+endif()
 
 include_directories(ext)
 include_directories(src)

ext/gpupixel/source/source_image.cc

@@ -9,11 +9,6 @@
 #include "../core/gpupixel_context.h"
 #include "../utils/util.h"
 
-#if defined(GPUPIXEL_ANDROID)
-#include <android/bitmap.h>
-#include "jni_helpers.h"
-#endif
-
 #ifdef SOURCE_IMAGE_SBTI
 #define STBI_NO_PSD
 #include "stb_image.h"
@@ -83,4 +78,3 @@ void SourceImage::init(int width, int height, int channel_count, int texid) {
                                 texid, GL_TEXTURE_2D, 0, /*dst_x*/0, /*dst_y*/0, 0,
                                 width, height, 1));
 }
-

ext/gpupixel/utils/util.cc

@@ -181,8 +181,7 @@ std::string Util::str_format(const char* fmt, ...) {
 
 int64_t Util::nowTimeMs() {
   auto time_now = std::chrono::system_clock::now();
-  auto duration_in_ms = std::chrono::duration_cast<std::chrono::milliseconds>(
-      time_now.time_since_epoch());
+  auto duration_in_ms = std::chrono::duration_cast<std::chrono::milliseconds>(time_now.time_since_epoch());
   int64_t ts = duration_in_ms.count();
   return ts;
 }
@@ -202,7 +201,7 @@ void Util::Log(const std::string& tag,std::string format, ...) {
 #elif defined(GPUPIXEL_IOS) || defined(GPUPIXEL_MAC)
   NSLog(@"%s", buffer);
 #elif defined(GPUPIXEL_LINUX)
- printf("%s\n", buffer);
+  printf("%s\n", buffer);
 #endif
 }
 

src/platform/renderer_filters.cpp

@@ -8,6 +8,8 @@
 
 ANK_REGISTER_PROPS_ITERATOR(config_load_filter_properties);
 
+#if !defined(GAME_PLATFORM_ANDROID)
+
 struct renderer_filter_t {
     std::shared_ptr<gpupixel::Filter> bilaterial;
     bool bilaterial_active = false;
@@ -147,4 +149,15 @@ void config_load_filter_properties(bool header) {
 
         last->addTarget(data.outputImage);
     }
-}
+}
+
+#else
+
+void platform_render_init_filters() {}
+bool platform_render_support_filters() { return false; }
+bool platform_render_any_filter_active() { return false; }
+void platform_render_proceed_filter(int w, int h, int format, const std::vector<uint8_t> &pixels, SDL_Texture *filter_texture) {}
+void platform_render_init_filter_context() {}
+void config_load_filter_properties(bool) {}
+
+#endif //