From 1398c719e3f2c741839c85203a17446ebc079c8d Mon Sep 17 00:00:00 2001 From: Tobin Ehlis Date: Wed, 9 Mar 2016 16:12:48 -0700 Subject: layers: Merge mem_tracker and draw_state layers into core_validation layer cube & tri --validate now use core_validation instead of MT & DS Very little efficiency has been pulled out for this initial merge. A few maps have been merged, but otherwise almost all of the mem_tracker code is pulled intact and surrounded in "#if MTMERGE" blocks. Change-Id: Icf060bfc0177fc8c9fa7d8d57f7ddc446357b665 --- buildAndroid/jni/Android.mk | 16 ++-------------- buildAndroid/jni/Application.mk | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) (limited to 'buildAndroid') diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk index c1fd1421..03cc4da0 100644 --- a/buildAndroid/jni/Android.mk +++ b/buildAndroid/jni/Android.mk @@ -27,8 +27,8 @@ LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := VkLayer_draw_state -LOCAL_SRC_FILES += $(SRC_DIR)/layers/draw_state.cpp +LOCAL_MODULE := VkLayer_core_validation +LOCAL_SRC_FILES += $(SRC_DIR)/layers/core_validation.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(SRC_DIR)/buildAndroid/generated \ @@ -39,18 +39,6 @@ LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) -include $(CLEAR_VARS) -LOCAL_MODULE := VkLayer_mem_tracker -LOCAL_SRC_FILES += $(SRC_DIR)/layers/mem_tracker.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/buildAndroid/generated \ - $(SRC_DIR)/loader -LOCAL_STATIC_LIBRARIES += layer_utils -LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR -LOCAL_LDLIBS := -llog -include $(BUILD_SHARED_LIBRARY) - include $(CLEAR_VARS) LOCAL_MODULE := VkLayer_device_limits LOCAL_SRC_FILES += $(SRC_DIR)/layers/device_limits.cpp diff --git a/buildAndroid/jni/Application.mk b/buildAndroid/jni/Application.mk index 5be2d485..320db267 100644 --- a/buildAndroid/jni/Application.mk +++ b/buildAndroid/jni/Application.mk @@ -16,6 +16,6 @@ APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64 APP_PLATFORM := android-22 APP_STL := gnustl_static -APP_MODULES := layer_utils VkLayer_draw_state VkLayer_mem_tracker VkLayer_device_limits VkLayer_image VkLayer_param_checker VkLayer_object_tracker VkLayer_threading VkLayer_swapchain VkLayer_unique_objects +APP_MODULES := layer_utils VkLayer_core_validation VkLayer_device_limits VkLayer_image VkLayer_param_checker VkLayer_object_tracker VkLayer_threading VkLayer_swapchain VkLayer_unique_objects APP_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES -Wall -Werror -Wno-unused-function -Wno-unused-const-variable NDK_TOOLCHAIN_VERSION := clang -- cgit v1.2.3