summaryrefslogtreecommitdiff
path: root/build-android
diff options
context:
space:
mode:
authorDave Houlton <daveh@lunarg.com>2017-03-27 17:25:54 -0600
committerDave Houlton <daveh@lunarg.com>2017-03-29 15:07:42 -0600
commit1c55ba02ac8e31fad486ae3ffcf7d207a5e4179a (patch)
tree3674872535774d04f73a3ff4d9ca0a00543fc905 /build-android
parentae22b47919734a44da5b77a7a54161fc4a86499e (diff)
layers: refactor layer utils
Split format-related helper fxns out of vk_layer_utils.cpp into a new file vk_format_utils.cpp. Remove the duplicated fxns in the render framework and share the new format utils across both projects. Rename the util fxns into CamelCase per coding std. Change-Id: I0f9a34bc5931dfca085dfdc8d4800664aec526cf
Diffstat (limited to 'build-android')
-rw-r--r--build-android/android-generate.bat1
-rwxr-xr-xbuild-android/android-generate.sh1
-rw-r--r--build-android/jni/Android.mk1
3 files changed, 3 insertions, 0 deletions
diff --git a/build-android/android-generate.bat b/build-android/android-generate.bat
index fb5e393a..cb87283c 100644
--- a/build-android/android-generate.bat
+++ b/build-android/android-generate.bat
@@ -35,6 +35,7 @@ cd ../..
copy /Y ..\layers\vk_layer_config.cpp generated\common\
copy /Y ..\layers\vk_layer_extension_utils.cpp generated\common\
copy /Y ..\layers\vk_layer_utils.cpp generated\common\
+copy /Y ..\layers\vk_format_utils.cpp generated\common\
copy /Y ..\layers\vk_layer_table.cpp generated\common\
copy /Y ..\layers\descriptor_sets.cpp generated\common\
copy /Y ..\layers\buffer_validation.cpp generated\common\
diff --git a/build-android/android-generate.sh b/build-android/android-generate.sh
index dcd61623..4a2727aa 100755
--- a/build-android/android-generate.sh
+++ b/build-android/android-generate.sh
@@ -37,6 +37,7 @@ mkdir -p generated/include generated/common
cp -f ../layers/vk_layer_config.cpp generated/common/
cp -f ../layers/vk_layer_extension_utils.cpp generated/common/
cp -f ../layers/vk_layer_utils.cpp generated/common/
+cp -f ../layers/vk_format_utils.cpp generated/common/
cp -f ../layers/vk_layer_table.cpp generated/common/
cp -f ../layers/descriptor_sets.cpp generated/common/
cp -f ../layers/buffer_validation.cpp generated/common/
diff --git a/build-android/jni/Android.mk b/build-android/jni/Android.mk
index 0c8f10d4..10c58ce1 100644
--- a/build-android/jni/Android.mk
+++ b/build-android/jni/Android.mk
@@ -23,6 +23,7 @@ LOCAL_MODULE := layer_utils
LOCAL_SRC_FILES += $(LAYER_DIR)/common/vk_layer_config.cpp
LOCAL_SRC_FILES += $(LAYER_DIR)/common/vk_layer_extension_utils.cpp
LOCAL_SRC_FILES += $(LAYER_DIR)/common/vk_layer_utils.cpp
+LOCAL_SRC_FILES += $(LAYER_DIR)/common/vk_format_utils.cpp
LOCAL_C_INCLUDES += $(SRC_DIR)/include \
$(LAYER_DIR)/include \
$(SRC_DIR)/layers \