From 7ce1eb5906dace0f2f9fa78706c92161ddcd4027 Mon Sep 17 00:00:00 2001 From: Mark Lobodzinski Date: Wed, 30 Dec 2015 08:16:12 -0700 Subject: layers: Rename Layer/library/json files for consistency Renamed layers from (for example) xxx_DrawState to xxx_draw_state Renamed JSON files Renamed libraries Renamed object_track.* to object_tracker.* Renamed apidump.h to api_dump.h Renamed screen_shot layer to screenshot Renamed APIDump layer settings file options to ApiDump Bug fixes here and there from prior renames --- buildAndroid/android-generate.sh | 9 +++++---- buildAndroid/jni/Android.mk | 25 +++++++++++++------------ buildAndroid/jni/Application.mk | 3 ++- 3 files changed, 20 insertions(+), 17 deletions(-) (limited to 'buildAndroid') diff --git a/buildAndroid/android-generate.sh b/buildAndroid/android-generate.sh index e3e59e9b..c8fda268 100755 --- a/buildAndroid/android-generate.sh +++ b/buildAndroid/android-generate.sh @@ -1,6 +1,7 @@ #!/bin/bash # Copyright 2015 The Android Open Source Project +# Copyright (C) 2015 Valve Corporation # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,8 +22,8 @@ python ../vk-generate.py dispatch-table-ops layer > generated/vk_dispatch_table_ python ../vk_helper.py --gen_enum_string_helper ../include/vulkan/vulkan.h --abs_out_dir generated python ../vk_helper.py --gen_struct_wrappers ../include/vulkan/vulkan.h --abs_out_dir generated -python ../vk-layer-generate.py Generic ../include/vulkan/vulkan.h > generated/generic_layer.cpp -python ../vk-layer-generate.py APIDump ../include/vulkan/vulkan.h > generated/api_dump.cpp -python ../vk-layer-generate.py ObjectTracker ../include/vulkan/vulkan.h > generated/object_track.cpp -python ../vk-layer-generate.py Threading ../include/vulkan/vulkan.h > generated/threading.cpp +python ../vk-layer-generate.py generic ../include/vulkan/vulkan.h > generated/generic_layer.cpp +python ../vk-layer-generate.py api_dump ../include/vulkan/vulkan.h > generated/api_dump.cpp +python ../vk-layer-generate.py object_tracker ../include/vulkan/vulkan.h > generated/object_tracker.cpp +python ../vk-layer-generate.py threading ../include/vulkan/vulkan.h > generated/threading.cpp diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk index f8d93713..1526711f 100644 --- a/buildAndroid/jni/Android.mk +++ b/buildAndroid/jni/Android.mk @@ -1,4 +1,5 @@ # Copyright 2015 The Android Open Source Project +# Copyright (C) 2015 Valve Corporation # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -26,7 +27,7 @@ LOCAL_CPPFLAGS += -DVK_USE_PLATFORM_ANDROID_KHR include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := VKLayerBasic +LOCAL_MODULE := VkLayer_basic LOCAL_SRC_FILES += $(SRC_DIR)/layers/basic.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ @@ -37,7 +38,7 @@ LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := VKLayerDrawState +LOCAL_MODULE := VkLayer_draw_state LOCAL_SRC_FILES += $(SRC_DIR)/layers/draw_state.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_debug_marker_table.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp @@ -51,7 +52,7 @@ LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := VKLayerMemTracker +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 \ @@ -63,7 +64,7 @@ LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := VKLayerDeviceLimits +LOCAL_MODULE := VkLayer_device_limits LOCAL_SRC_FILES += $(SRC_DIR)/layers/device_limits.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_debug_marker_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ @@ -75,7 +76,7 @@ LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := VKLayerImage +LOCAL_MODULE := VkLayer_image LOCAL_SRC_FILES += $(SRC_DIR)/layers/image.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ @@ -87,7 +88,7 @@ LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := VKLayerParamChecker +LOCAL_MODULE := VkLayer_param_checker LOCAL_SRC_FILES += $(SRC_DIR)/layers/param_checker.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_debug_marker_table.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp @@ -100,7 +101,7 @@ LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := VKLayerGeneric +LOCAL_MODULE := VkLayer_generic LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/generic_layer.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ @@ -113,7 +114,7 @@ LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := VKLayerAPIDump +LOCAL_MODULE := VkLayer_api_dump LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/api_dump.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ @@ -126,8 +127,8 @@ LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := VKLayerObjectTracker -LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/object_track.cpp +LOCAL_MODULE := VkLayer_object_tracker +LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/object_tracker.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ $(SRC_DIR)/layers \ @@ -139,7 +140,7 @@ LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := VKLayerThreading +LOCAL_MODULE := VkLayer_threading LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/threading.cpp LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp LOCAL_C_INCLUDES += $(SRC_DIR)/include \ @@ -152,7 +153,7 @@ LOCAL_LDLIBS := -llog include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) -LOCAL_MODULE := VKLayerValidationTests +LOCAL_MODULE := VkLayerValidationTests LOCAL_SRC_FILES += $(SRC_DIR)/tests/layer_validation_tests.cpp \ $(SRC_DIR)/tests/vktestbinding.cpp \ $(SRC_DIR)/tests/vktestframeworkandroid.cpp \ diff --git a/buildAndroid/jni/Application.mk b/buildAndroid/jni/Application.mk index f5aa22cb..0fb770aa 100644 --- a/buildAndroid/jni/Application.mk +++ b/buildAndroid/jni/Application.mk @@ -1,4 +1,5 @@ # Copyright 2015 The Android Open Source Project +# Copyright (C) 2015 Valve Corporation # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,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 VKLayerBasic VKLayerDrawState VKLayerMemTracker VKLayerDeviceLimits VKLayerImage VKLayerParamChecker VKLayerGeneric VKLayerAPIDump VKLayerObjectTracker VKLayerThreading VKLayerValidationTests +APP_MODULES := layer_utils VkLayer_basic VkLayer_draw_state VkLayer_mem_tracker VkLayer_device_limits VkLayer_image VkLayer_param_checker VkLayer_generic VkLayer_api_dump VkLayer_object_tracker VkLayer_threading VkLayerValidationTests APP_CPPFLAGS += -std=c++11 -DVK_PROTOTYPES NDK_TOOLCHAIN_VERSION := 4.8 -- cgit v1.2.3