From 8d7d10ae816df01d80ecbc34b9a2c0a7839ecd71 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@curious-creature.com>
Date: Thu, 16 May 2019 11:35:49 -0700
Subject: [PATCH] Use 64x64 DFG LUT on mobile targets (#1191)

The size of the LUT is now configurable at build-time with
-DDFG_LUT_SIZE=XX. It is 128x128 on desktop, 64x64 on Android,
WebGL and iOS.
---
 filament/CMakeLists.txt    | 24 +++++++++++++++++++++---
 filament/src/details/DFG.h |  8 +++++++-
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/filament/CMakeLists.txt b/filament/CMakeLists.txt
index 70a1e0ac7c..ae432e37de 100644
--- a/filament/CMakeLists.txt
+++ b/filament/CMakeLists.txt
@@ -134,11 +134,29 @@ get_resgen_vars(${RESOURCE_DIR} materials)
 list(APPEND PRIVATE_HDRS ${RESGEN_HEADER})
 list(APPEND SRCS ${RESGEN_SOURCE})
 
+# ==================================================================================================
+# Configuration
+# ==================================================================================================
+if (ANDROID OR WEBGL OR IOS)
+    set(IS_MOBILE_TARGET TRUE)
+endif()
+
+# Size of the DFG lookup table
+if (NOT DFG_LUT_SIZE)
+    if (IS_MOBILE_TARGET)
+        set(DFG_LUT_SIZE 64)
+    else()
+        set(DFG_LUT_SIZE 128)
+    endif()
+endif()
+message(STATUS "DFG LUT size set to ${DFG_LUT_SIZE}x${DFG_LUT_SIZE}")
+
 # ==================================================================================================
 # Definitions
 # ==================================================================================================
 # "2" corresponds to SYSTRACE_TAG_FILEMENT (See: utils/Systrace.h)
-add_definitions(-DSYSTRACE_TAG=2 )
+add_definitions(-DSYSTRACE_TAG=2)
+add_definitions(-DFILAMENT_DFG_LUT_SIZE=${DFG_LUT_SIZE})
 
 # ==================================================================================================
 # Generate all .filamat: default material, skyboxes, and post-process
@@ -152,7 +170,7 @@ set(MATERIAL_BINS)
 file(MAKE_DIRECTORY ${MATERIAL_DIR})
 
 # Target system.
-if (ANDROID OR WEBGL OR IOS)
+if (IS_MOBILE_TARGET)
     set(MATC_TARGET mobile)
 else()
     set(MATC_TARGET desktop)
@@ -212,7 +230,7 @@ file(MAKE_DIRECTORY "${GENERATION_ROOT}/generated/data/")
 set(output_path "${GENERATION_ROOT}/generated/data/dfg.inc")
 add_custom_command(
         OUTPUT ${output_path}
-        COMMAND cmgen --quiet --ibl-dfg-multiscatter --ibl-dfg-cloth --ibl-dfg=${output_path}
+        COMMAND cmgen --quiet --size=${DFG_LUT_SIZE} --ibl-dfg-multiscatter --ibl-dfg-cloth --ibl-dfg=${output_path}
         DEPENDS cmgen
         COMMENT "Generating DFG LUT ${output_path}"
 )
diff --git a/filament/src/details/DFG.h b/filament/src/details/DFG.h
index 85865e0618..8e66f1e3b3 100644
--- a/filament/src/details/DFG.h
+++ b/filament/src/details/DFG.h
@@ -29,6 +29,10 @@ namespace details {
 class FEngine;
 class FTexture;
 
+#if !defined(FILAMENT_DFG_LUT_SIZE)
+#define FILAMENT_DFG_LUT_SIZE 128
+#endif
+
 class DFG {
 public:
     explicit DFG(FEngine& engine) noexcept;
@@ -57,12 +61,14 @@ private:
     FTexture* mLUT = nullptr;
 
     // make sure to use the right size here
-    static constexpr size_t DFG_LUT_SIZE = 128;
+    static constexpr size_t DFG_LUT_SIZE = FILAMENT_DFG_LUT_SIZE;
 
     // this lookup table is generated with cmgen
     static const uint16_t DFG_LUT[];
 };
 
+#undef FILAMENT_DFG_LUT_SIZE
+
 } // namespace details
 } // namespace filament