From ac5ff94a099f4278aa710c71904233b578f79c65 Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Thu, 3 Mar 2016 12:03:58 -0700 Subject: misc: Remove lunarg_debug_marker extension This device extensions was not completely supported in any layer. It had partial support (intercept) in draw_state and device_limits. This extension is being changed and has a formal proposal in Khronos as debug_marker_ext. Removing the existing extension since it is deprecated; once the debug_marker_ext gets registered by Khronos, layers might want to start using the ObjectTag/ObjectName commands to supplement error report messages in debug_report_ext. Since debug_report_ext might get changed as part of Khronos review, don't add it yet. --- buildAndroid/jni/Android.mk | 289 ++++++++++++++++++++++---------------------- 1 file changed, 143 insertions(+), 146 deletions(-) (limited to 'buildAndroid') diff --git a/buildAndroid/jni/Android.mk b/buildAndroid/jni/Android.mk index 1d2f0f78..0e39de8d 100644 --- a/buildAndroid/jni/Android.mk +++ b/buildAndroid/jni/Android.mk @@ -1,146 +1,143 @@ -# 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. -# You may obtain a copy of the License at - -# http://www.apache.org/licenses/LICENSE-2.0 - -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LOCAL_PATH := $(abspath $(call my-dir)) -MY_PATH := $(LOCAL_PATH) -SRC_DIR := $(LOCAL_PATH)/../../ - -include $(CLEAR_VARS) -LOCAL_MODULE := layer_utils -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_config.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_extension_utils.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_utils.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include -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_SRC_FILES += $(SRC_DIR)/layers/vk_layer_debug_marker_table.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/buildAndroid/generated \ - $(SRC_DIR)/loader \ - $(SRC_DIR)/../glslang/SPIRV -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_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 -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_debug_marker_table.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_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 \ - $(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_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 -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/buildAndroid/generated \ - $(SRC_DIR)/layers \ - $(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_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 \ - $(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_threading -LOCAL_SRC_FILES += $(SRC_DIR)/layers/threading.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/layers \ - $(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_unique_objects -LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/unique_objects.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/vk_safe_struct.cpp -LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp -LOCAL_C_INCLUDES += $(SRC_DIR)/include \ - $(SRC_DIR)/layers \ - $(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_swapchain -LOCAL_SRC_FILES += $(SRC_DIR)/layers/swapchain.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) - -$(call import-module,third_party/googletest) +# 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. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +LOCAL_PATH := $(abspath $(call my-dir)) +MY_PATH := $(LOCAL_PATH) +SRC_DIR := $(LOCAL_PATH)/../../ + +include $(CLEAR_VARS) +LOCAL_MODULE := layer_utils +LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_config.cpp +LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_extension_utils.cpp +LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_utils.cpp +LOCAL_C_INCLUDES += $(SRC_DIR)/include +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_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp +LOCAL_C_INCLUDES += $(SRC_DIR)/include \ + $(SRC_DIR)/buildAndroid/generated \ + $(SRC_DIR)/loader \ + $(SRC_DIR)/../glslang/SPIRV +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_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 +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_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 \ + $(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_param_checker +LOCAL_SRC_FILES += $(SRC_DIR)/layers/param_checker.cpp +LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp +LOCAL_C_INCLUDES += $(SRC_DIR)/include \ + $(SRC_DIR)/buildAndroid/generated \ + $(SRC_DIR)/layers \ + $(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_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 \ + $(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_threading +LOCAL_SRC_FILES += $(SRC_DIR)/layers/threading.cpp +LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp +LOCAL_C_INCLUDES += $(SRC_DIR)/include \ + $(SRC_DIR)/layers \ + $(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_unique_objects +LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/unique_objects.cpp +LOCAL_SRC_FILES += $(SRC_DIR)/buildAndroid/generated/vk_safe_struct.cpp +LOCAL_SRC_FILES += $(SRC_DIR)/layers/vk_layer_table.cpp +LOCAL_C_INCLUDES += $(SRC_DIR)/include \ + $(SRC_DIR)/layers \ + $(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_swapchain +LOCAL_SRC_FILES += $(SRC_DIR)/layers/swapchain.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) + +$(call import-module,third_party/googletest) -- cgit v1.2.3