diff options
Diffstat (limited to 'meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers')
6 files changed, 16 insertions, 80 deletions
diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0002-layers-obey-CXX_FLAGS.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0002-layers-obey-CXX_FLAGS.patch deleted file mode 100644 index b1ea9dd1..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0002-layers-obey-CXX_FLAGS.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 18a990d4b6677ba7e3e7b0d4a2980864da4826a5 Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Tue, 16 Aug 2016 20:23:59 +0500 -Subject: [PATCH] layers: obey CXX_FLAGS - -The CMakeLists earlier simply dropped all the CXX_FLAGS -set throught he build system. This limits any chances -of providing custom flags such as linking directories -etc. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - layers/CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt -index b384803..c67f1df 100644 ---- a/layers/CMakeLists.txt -+++ b/layers/CMakeLists.txt -@@ -99,8 +99,7 @@ if (WIN32) - set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_CRT_SECURE_NO_WARNINGS /bigobj") - set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_CRT_SECURE_NO_WARNINGS /bigobj") - else() -- set (CMAKE_CXX_FLAGS "-std=c++11") -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpointer-arith") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wpointer-arith") - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith") - endif() - --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0004-install-the-vulkan-loader.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0004-install-the-vulkan-loader.patch index 99875968..68026245 100644 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0004-install-the-vulkan-loader.patch +++ b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0004-install-the-vulkan-loader.patch @@ -18,7 +18,7 @@ index a4d2b21..2790faa 100644 +++ b/loader/CMakeLists.txt @@ -84,4 +84,5 @@ else() add_library(vulkan SHARED ${LOADER_SRCS}) - set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "1.0.21") + set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "1.0.26") target_link_libraries(vulkan -ldl -lpthread -lm) + install(TARGETS vulkan DESTINATION ${CMAKE_INSTALL_LIBDIR}) endif() diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0005-install-demos.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0005-install-demos.patch index 0ab7a155..08f0f8f0 100644 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0005-install-demos.patch +++ b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0005-install-demos.patch @@ -35,11 +35,11 @@ index 4dc90cd..415ac2f 100644 + +install(TARGETS smoketest DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/libs/vkjson/CMakeLists.txt b/libs/vkjson/CMakeLists.txt -index fc69bb6..728ea74 100644 +index 4c0aef8..9b03d3d 100644 --- a/libs/vkjson/CMakeLists.txt +++ b/libs/vkjson/CMakeLists.txt -@@ -33,6 +34,8 @@ add_library(vkjson STATIC vkjson.cc vkjson_instance.cc ../../loader/cJSON.c) - if(UNIX) +@@ -32,6 +32,8 @@ if(UNIX) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-sign-compare") add_executable(vkjson_unittest vkjson_unittest.cc) add_executable(vkjson_info vkjson_info.cc) + install(TARGETS vkjson_unittest DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -47,7 +47,6 @@ index fc69bb6..728ea74 100644 else() set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS") add_executable(vkjson_unittest vkjson_unittest.cc) - -- 1.9.1 diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0006-json-correct-layer-lib-paths.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0006-json-correct-layer-lib-paths.patch index 42a57ee1..54d092ba 100644 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0006-json-correct-layer-lib-paths.patch +++ b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0006-json-correct-layer-lib-paths.patch @@ -28,7 +28,7 @@ index 3f2162d..c0ef9b7 100644 "type": "GLOBAL", - "library_path": "./libVkLayer_core_validation.so", + "library_path": "libVkLayer_core_validation.so", - "api_version": "1.0.21", + "api_version": "1.0.26", "implementation_version": "1", "description": "LunarG Validation Layer", diff --git a/layers/linux/VkLayer_image.json b/layers/linux/VkLayer_image.json @@ -41,7 +41,7 @@ index 97a250e..6fa3bbd 100644 "type": "GLOBAL", - "library_path": "./libVkLayer_image.so", + "library_path": "libVkLayer_image.so", - "api_version": "1.0.21", + "api_version": "1.0.26", "implementation_version": "1", "description": "LunarG Validation Layer", diff --git a/layers/linux/VkLayer_object_tracker.json b/layers/linux/VkLayer_object_tracker.json @@ -54,7 +54,7 @@ index 1c5d79b..49e5a29 100644 "type": "GLOBAL", - "library_path": "./libVkLayer_object_tracker.so", + "library_path": "libVkLayer_object_tracker.so", - "api_version": "1.0.21", + "api_version": "1.0.26", "implementation_version": "1", "description": "LunarG Validation Layer", diff --git a/layers/linux/VkLayer_parameter_validation.json b/layers/linux/VkLayer_parameter_validation.json @@ -67,7 +67,7 @@ index 899ea88..6df74f8 100644 "type": "GLOBAL", - "library_path": "./libVkLayer_parameter_validation.so", + "library_path": "libVkLayer_parameter_validation.so", - "api_version": "1.0.21", + "api_version": "1.0.26", "implementation_version": "1", "description": "LunarG Validation Layer", diff --git a/layers/linux/VkLayer_swapchain.json b/layers/linux/VkLayer_swapchain.json @@ -80,7 +80,7 @@ index 5fe0ef8..6d0b500 100644 "type": "GLOBAL", - "library_path": "./libVkLayer_swapchain.so", + "library_path": "libVkLayer_swapchain.so", - "api_version": "1.0.21", + "api_version": "1.0.26", "implementation_version": "1", "description": "LunarG Validation Layer", diff --git a/layers/linux/VkLayer_threading.json b/layers/linux/VkLayer_threading.json @@ -93,7 +93,7 @@ index 59feb59..fd6bedf 100644 "type": "GLOBAL", - "library_path": "./libVkLayer_threading.so", + "library_path": "libVkLayer_threading.so", - "api_version": "1.0.21", + "api_version": "1.0.26", "implementation_version": "1", "description": "Google Validation Layer", diff --git a/layers/linux/VkLayer_unique_objects.json b/layers/linux/VkLayer_unique_objects.json @@ -106,7 +106,7 @@ index 59e1f89..72b77ee 100644 "type": "GLOBAL", - "library_path": "./libVkLayer_unique_objects.so", + "library_path": "libVkLayer_unique_objects.so", - "api_version": "1.0.21", + "api_version": "1.0.26", "implementation_version": "1", "description": "Google Validation Layer" -- diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0007-obey-CMAKE_INSTALL_PREFIX.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0007-obey-CMAKE_INSTALL_PREFIX.patch deleted file mode 100644 index 9bcaacd2..00000000 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0007-obey-CMAKE_INSTALL_PREFIX.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 15973dcf82c95ca05a4d76bd69785df2679876d6 Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Thu, 1 Sep 2016 13:27:50 +0500 -Subject: [PATCH] obey CMAKE_INSTALL_PREFIX - -Unsetting CMAKE_INSTALL_PREFIX breaks relative installation -paths. The recent updates to cmake.bbclass requires -using the installation prefix to allow installing to -correct hierarchy under yocto environment. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> ---- - CMakeLists.txt | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 263002e..a0d3baa 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,8 +57,6 @@ if(NOT WIN32) - include(FindPkgConfig) - endif() - --set (CMAKE_INSTALL_PREFIX "") -- - if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang") - set(COMMON_COMPILE_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers") - set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -fno-strict-aliasing -fno-builtin-memcmp") --- -1.9.1 - diff --git a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0008-demos-make-shader-location-relative.patch b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0008-demos-make-shader-location-relative.patch index 281f9069..16409b57 100644 --- a/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0008-demos-make-shader-location-relative.patch +++ b/meta-amdfalconx86/recipes-graphics/lunarg-sdk/vulkan-loader-layers/0008-demos-make-shader-location-relative.patch @@ -19,7 +19,7 @@ Signed-off-by: Awais Belal <awais_belal@mentor.com> 2 files changed, 105 insertions(+), 8 deletions(-) diff --git a/demos/cube.c b/demos/cube.c -index 5b26288..b4a787e 100644 +index 6017444..f79bc59 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -29,6 +29,7 @@ @@ -27,7 +27,7 @@ index 5b26288..b4a787e 100644 #include <assert.h> #include <signal.h> +#include <unistd.h> - #ifdef __linux__ + #if defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_XCB_KHR) #include <X11/Xutil.h> #endif @@ -415,6 +416,8 @@ struct demo { @@ -150,10 +150,10 @@ index 5b26288..b4a787e 100644 static void demo_init(struct demo *demo, int argc, char **argv) { vec3 eye = {0.0f, 3.0f, 5.0f}; vec3 origin = {0, 0, 0}; -@@ -3093,6 +3143,8 @@ static void demo_init(struct demo *demo, int argc, char **argv) { - 1.0f, 0.1f, 100.0f); - mat4x4_look_at(demo->view_matrix, eye, origin, up); +@@ -3053,6 +3053,8 @@ static void demo_init(struct demo *demo, int argc, char **argv) { mat4x4_identity(demo->model_matrix); + + demo->projection_matrix[1][1]*=-1; //Flip projection matrix from GL to Vulkan orientation. + + find_bin_path(argv[0], demo->bin_path); } |