add etc2comp dependency on desktop and android

android/build.gradle

@@ -14,7 +14,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0'
     }
 }
 
@@ -66,19 +66,19 @@ ext {
 def baseFolder = new File(HIFI_ANDROID_PRECOMPILED)
 def appDir = new File(projectDir, 'app')
 def jniFolder = new File(appDir, 'src/main/jniLibs/arm64-v8a')
-def baseUrl = 'https://hifi-public.s3.amazonaws.com/austin/android/'
+def baseUrl = 'https://hifi-public.s3.amazonaws.com/dependencies/android/'
 
 def qtFile='qt-5.9.3_linux_armv8-libcpp_openssl.tgz'
 def qtChecksum='04599670ccca84bd2b15f6915568eb2d'
-def qtVersionId='PeoqzN31n.YvLfs9JE2SgHgZ4.IaKAlt'
+def qtVersionId='8QbCma4ryEPgBYn_8kgYgB10IvNx9I1W'
 if (Os.isFamily(Os.FAMILY_MAC)) {
     qtFile = 'qt-5.9.3_osx_armv8-libcpp_openssl.tgz'
     qtChecksum='4b02de9d67d6bfb202355a808d2d9c59'
-    qtVersionId='HygCmtMLPYioyil0DfXckGVzhw2SXZA9'
+    qtVersionId='2gfgoYCggJGyXxKiazaPGsMs1Gn9j4og'
 } else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
     qtFile = 'qt-5.9.3_win_armv8-libcpp_openssl.tgz'
     qtChecksum='c3e25db64002d0f43cf565e0ef708911'
-    qtVersionId='HeVObSVLCBoc7yY7He1oBMvPIH0VkClT'
+    qtVersionId='xKIteC6HO0xrmcWeMmhQcmKyPEsnUrcZ'
 }
 
 def packages = [
@@ -89,61 +89,66 @@ def packages = [
     ],
     bullet: [
         file: 'bullet-2.83_armv8-libcpp.tgz',
-        versionId: 'ljb7v.1IjVRqyopUKVDbVnLA4z88J8Eo',
+        versionId: 'L6MqTwt24yZAx0cHgLyN.GPky1kVGsq3',
         checksum: '2c558d604fce337f5eba3eb7ec1252fd',
     ],
     draco: [
         file: 'draco_armv8-libcpp.tgz',
-        versionId: 'cA3tVJSmkvb1naA3l6D_Jv2Noh.4yc4m',
+        versionId: '3.B.uBj31kWlgND3_R2xwQzT_TP6Dz_8',
         checksum: '617a80d213a5ec69fbfa21a1f2f738cd',
     ],
     glad: [
         file: 'glad_armv8-libcpp.zip',
-        versionId: 'Q9szthzeye8fFyAA.cY26Lgn2B8kezEE',
+        versionId: 'r5Zran.JSCtvrrB6Q4KaqfIoALPw3lYY',
         checksum: 'a8ee8584cf1ccd34766c7ddd9d5e5449',
     ],
     glm: [
         file: 'glm-0.9.8.tgz',
-        versionId: 'BlkJNwaYV2Gfy5XwMeU7K0uzPDRKFMt2',
+        versionId: 'CHPAk.Un_8MC4v8cIqkEJ468Y4_RQDmd',
         checksum: 'd2b42cee31d2bc17bab6ce69e6b3f30a',
     ],
     gvr: [
         file: 'gvrsdk_v1.101.0.tgz',
-        versionId: 'UTberAIFraEfF9IVjoV66u1DTPTopgeY',
+        versionId: 'nqBV_j81Uc31rC7bKIrlya_Hah4v3y5r',
         checksum: '57fd02baa069176ba18597a29b6b4fc7',
     ],
     nvtt: [
         file: 'nvtt_armv8-libcpp.zip',
-        versionId: 'vLqrqThvpq4gp75BHMAqO6HhfTXaa0An',
+        versionId: 'lmkBVR5t4UF1UUwMwEirnk9H_8Nt90IO',
         checksum: 'eb46d0b683e66987190ed124aabf8910',
         sharedLibFolder: 'lib',
         includeLibs: ['libnvtt.so', 'libnvmath.so', 'libnvimage.so', 'libnvcore.so'],
     ],
     openssl: [
         file: 'openssl-1.1.0g_armv8.tgz',
-        versionId: 'DmahmSGFS4ltpHyTdyQvv35WOeUOiib9',
+        versionId: 'AiiPjmgUZTgNj7YV1EEx2lL47aDvvvAW',
         checksum: 'cabb681fbccd79594f65fcc266e02f32',
     ],
     polyvox: [
         file: 'polyvox_armv8-libcpp.tgz',
-        versionId: 'LDJtzMTvdm4SAc2KYg8Cg6uwWk4Vq3e3',
-        checksum: '349ad5b72aaf2749ca95d847e60c5314',
+        versionId: 'UmHp.EOFiepdXnv2YxwNXNO3J6nVsBkE',
+        checksum: '5c918288741ee754c16aeb12bb46b9e1',
         sharedLibFolder: 'lib',
         includeLibs: ['Release/libPolyVoxCore.so', 'libPolyVoxUtil.so'],
     ],
     tbb: [
         file: 'tbb-2018_U1_armv8_libcpp.tgz',
-        versionId: 'YZliDD8.Menh1IVXKEuLPeO3xAjJ1UdF',
+        versionId: 'mrRbWnv4O4evcM1quRH43RJqimlRtaKB',
         checksum: '20768f298f53b195e71b414b0ae240c4',
         sharedLibFolder: 'lib/release',
         includeLibs: ['libtbb.so', 'libtbbmalloc.so'],
     ],
     hifiAC: [
         file: 'libplugins_libhifiCodec.zip',
-        versionId: 'mzKhsRCgVmloqq5bvE.0IwYK1NjGQc_G',
+        versionId: 'i31pW.qNbvFOXRxbyiJUxg3sphaFNmZU',
         checksum: '9412a8e12c88a4096c1fc843bb9fe52d',
         sharedLibFolder: '',
         includeLibs: ['libplugins_libhifiCodec.so']
+    ],
+    etc2comp: [
+        file: 'etc2comp-armv8-libcpp.tgz',
+        versionId: '1WfqJYWLOP0g22eikYjBzn62gza7MKE6',
+        checksum: '0b4c2e6de728546845f0e471dfdeb604'
     ]
 ]
 
@@ -152,15 +157,15 @@ def scribeLocalFile='scribe' + EXEC_SUFFIX
 
 def scribeFile='scribe_linux_x86_64'
 def scribeChecksum='ca4b904f52f4f993c29175ba96798fa6'
-def scribeVersion='wgpf4dB2Ltzg4Lb2jJ4nPFsHoDkmK_OO'
+def scribeVersion='u_iTrJDaE95i2abTPXOpPZckGBIim53G'
 if (Os.isFamily(Os.FAMILY_MAC)) {
     scribeFile = 'scribe_osx_x86_64'
     scribeChecksum='72db9d32d4e1e50add755570ac5eb749'
-    scribeVersion='o_NbPrktzEYtBkQf3Tn7zc1nZWzM52w6'
+    scribeVersion='DAW0DmnjCRib4MD8x93bgc2Z2MpPojZC'
 } else if (Os.isFamily(Os.FAMILY_WINDOWS)) {
     scribeFile = 'scribe_win32_x86_64.exe'
     scribeChecksum='678e43d290c90fda670c6fefe038a06d'
-    scribeVersion='GCCJxlmd2irvNOFWfZR0U1UCLHndHQrC'
+    scribeVersion='PuullrA_bPlO9kXZRt8rLe536X1UI.m7'
 }
 
 def options = [
@@ -361,6 +366,7 @@ task verifyOpenSSL(type: Verify) { def p = packages['openssl']; src new File(bas
 task verifyPolyvox(type: Verify) { def p = packages['polyvox']; src new File(baseFolder, p['file']); checksum p['checksum'] }
 task verifyTBB(type: Verify) { def p = packages['tbb']; src new File(baseFolder, p['file']); checksum p['checksum'] }
 task verifyHifiAC(type: Verify) { def p = packages['hifiAC']; src new File(baseFolder, p['file']); checksum p['checksum'] }
+task verifyEtc2Comp(type: Verify) { def p = packages['etc2comp']; src new File(baseFolder, p['file']); checksum p['checksum'] }
 
 task verifyDependencyDownloads(dependsOn: downloadDependencies) { }
 verifyDependencyDownloads.dependsOn verifyQt
@@ -371,6 +377,7 @@ verifyDependencyDownloads.dependsOn verifyOpenSSL
 verifyDependencyDownloads.dependsOn verifyPolyvox
 verifyDependencyDownloads.dependsOn verifyTBB
 verifyDependencyDownloads.dependsOn verifyHifiAC
+verifyDependencyDownloads.dependsOn verifyEtc2Comp
 
 task extractDependencies(dependsOn: verifyDependencyDownloads) {
     doLast {

cmake/externals/etc2comp/CMakeLists.txt

@@ -0,0 +1,44 @@
+set(EXTERNAL_NAME etc2comp)
+
+if (ANDROID)
+  set(ANDROID_CMAKE_ARGS "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}" "-DANDROID_NATIVE_API_LEVEL=19")
+endif ()
+
+include(ExternalProject)
+ExternalProject_Add(
+  ${EXTERNAL_NAME}
+  URL https://hifi-public.s3.amazonaws.com/dependencies/etc2comp-master.zip
+  URL_MD5 d0969e14af6b10b3306f880c8e2b1184
+  CMAKE_ARGS ${ANDROID_CMAKE_ARGS}
+  BINARY_DIR ${EXTERNAL_PROJECT_PREFIX}/build
+  INSTALL_COMMAND ""
+  LOG_DOWNLOAD 1
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+)
+
+# Hide this external target (for ide users)
+set_target_properties(${EXTERNAL_NAME} PROPERTIES FOLDER "hidden/externals")
+
+ExternalProject_Get_Property(${EXTERNAL_NAME} SOURCE_DIR)
+ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
+
+string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
+
+if (WIN32)
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/build/EtcLib/Debug/EtcLib.lib CACHE FILEPATH "Path to Etc2Comp debug library")
+
+  # use generator expression to ensure the correct library is found when building different configurations in VS
+  set(_LIB_FOLDER "$<$<CONFIG:RelWithDebInfo>:build/EtcLib/RelWithDebInfo>")
+  set(_LIB_FOLDER "${_LIB_FOLDER}$<$<CONFIG:MinSizeRel>:build/EtcLib/MinSizeRel>")
+  set(_LIB_FOLDER "${_LIB_FOLDER}$<$<OR:$<CONFIG:Release>,$<CONFIG:Debug>>:build/EtcLib/Release>")
+
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/${_LIB_FOLDER}/EtcLib.lib CACHE FILEPATH "Path to Etc2Comp release library")
+else ()
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG "" CACHE FILEPATH "Path to EtcLib debug library")
+  set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/build/EtcLib/libEtcLib.a CACHE FILEPATH "Path to EtcLib release library")
+endif ()
+
+set(ETC_INCLUDE_DIR ${SOURCE_DIR}/EtcLib/Etc CACHE FILEPATH "Path to Etc2Comp/Etc include directory")
+set(ETCCODEC_INCLUDE_DIR ${SOURCE_DIR}/EtcLib/EtcCodec CACHE FILEPATH "Path to Etc2Comp/EtcCodec include directory")
+# ETC2COMP_INCLUDE_DIRS will be set later by FindEtc2Comp

cmake/macros/TargetEtc2Comp.cmake

@@ -0,0 +1,22 @@
+#
+#  Copyright 2018 High Fidelity, Inc.
+#  Created by Sam Gondelman on 5/2/2018
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+#
+macro(TARGET_ETC2COMP)
+    if (ANDROID)
+        set(INSTALL_DIR ${HIFI_ANDROID_PRECOMPILED}/etc2comp)
+        set(ETC2COMP_INCLUDE_DIRS "${INSTALL_DIR}/include/Etc" "${INSTALL_DIR}/include/EtcCodec")
+        set(ETC2COMP_LIBRARY_DEBUG ${INSTALL_DIR}/lib/libEtcLib.a)
+        set(ETC2COMP_LIBRARY_RELEASE ${INSTALL_DIR}/lib/libEtcLib.a)
+        select_library_configurations(ETC2COMP)
+    else()
+        add_dependency_external_projects(etc2comp)
+        find_package(ETC2COMP REQUIRED)
+    endif()
+
+    target_include_directories(${TARGET_NAME} PRIVATE ${ETC2COMP_INCLUDE_DIRS})
+    target_link_libraries(${TARGET_NAME} ${ETC2COMP_LIBRARIES})
+endmacro()

cmake/modules/FindEtc2Comp.cmake

@@ -0,0 +1,37 @@
+#
+#  FindEtc2Comp.cmake
+#
+#  Try to find the Etc2Comp compression library.
+#
+#  Once done this will define
+#
+#  ETC2COMP_FOUND - system found Etc2Comp
+#  ETC2COMP_INCLUDE_DIRS - the Etc2Comp include directory
+#  ETC2COMP_LIBRARIES - link to this to use Etc2Comp
+#
+#  Created on 5/2/2018 by Sam Gondelman
+#  Copyright 2018 High Fidelity, Inc.
+#
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+#
+
+include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
+hifi_library_search_hints("etc2comp")
+
+find_path(ETC_INCLUDE_DIR NAMES Etc.h HINTS ${ETC2COMP_SEARCH_DIRS})
+find_path(ETCCODEC_INCLUDE_DIR NAMES EtcBlock4x4.h HINTS ${ETC2COMP_SEARCH_DIRS})
+set(ETC2COMP_INCLUDE_DIRS "${ETC_INCLUDE_DIR}" "${ETCCODEC_INCLUDE_DIR}")
+
+find_library(ETC2COMP_LIBRARY_DEBUG NAMES ETC2COMP ETC2COMP_LIB PATH_SUFFIXES EtcLib/Debug HINTS ${ETC2COMP_SEARCH_DIRS})
+find_library(ETC2COMP_LIBRARY_RELEASE NAMES ETC2COMP ETC2COMP_LIB PATH_SUFFIXES EtcLib/Release EtcLib HINTS ${ETC2COMP_SEARCH_DIRS})
+
+include(SelectLibraryConfigurations)
+select_library_configurations(ETC2COMP)
+
+set(ETC2COMP_LIBRARIES ${ETC2COMP_LIBRARY})
+
+find_package_handle_standard_args(ETC2COMP "Could NOT find ETC2COMP, try to set the path to ETC2COMP root folder in the system variable ETC2COMP_ROOT_DIR or create a directory etc2comp in HIFI_LIB_DIR and paste the necessary files there"
+ ETC2COMP_INCLUDE_DIRS ETC2COMP_LIBRARIES)
+
+mark_as_advanced(ETC2COMP_INCLUDE_DIRS ETC2COMP_LIBRARIES ETC2COMP_SEARCH_DIRS)

libraries/image/CMakeLists.txt

@@ -2,3 +2,4 @@ set(TARGET_NAME image)
 setup_hifi_library()
 link_hifi_libraries(shared gpu)
 target_nvtt()
+target_etc2comp()

libraries/image/src/image/Image.cpp

@@ -31,8 +31,14 @@ using namespace gpu;
 #define CPU_MIPMAPS 1
 #include <nvtt/nvtt.h>
 
+#include <Etc.h>
+
 static const glm::uvec2 SPARSE_PAGE_SIZE(128);
+#ifdef Q_OS_ANDROID
+static const glm::uvec2 MAX_TEXTURE_SIZE(1024);
+#else
 static const glm::uvec2 MAX_TEXTURE_SIZE(4096);
+#endif
 bool DEV_DECIMATE_TEXTURES = false;
 std::atomic<size_t> DECIMATED_TEXTURE_COUNT{ 0 };
 std::atomic<size_t> RECTIFIED_TEXTURE_COUNT{ 0 };