From: Xuelian Bai <xuelian.bai@samsung.com>
Date: Fri, 1 Sep 2023 06:25:10 +0000 (+0800)
Subject: Upgrade version to 1.3.268
X-Git-Tag: accepted/tizen/unified/20250322.012742~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dfd21981440db8134e5e73f62a1dd2d59b4ff9e2;p=platform%2Fupstream%2FVulkan-Loader.git

Upgrade version to 1.3.268

1. Add dlog for Tizen
2. Fix memory leak issue for generic list

Change-Id: Id1d95430af27e11bf76c83e3933475bf8eb6886d
---

diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
index 6296ebff..3d57bdd5 100644
--- a/loader/CMakeLists.txt
+++ b/loader/CMakeLists.txt
@@ -435,6 +435,11 @@ else()
     )
 
     target_link_libraries(vulkan PRIVATE ${CMAKE_DL_LIBS} m Threads::Threads)
+    option(TIZEN_PLATFORM "If build for Tizen platform")
+    if (TIZEN_PLATFORM)
+        add_definitions(-DTIZEN_PLATFORM)
+        target_link_libraries(vulkan PRIVATE dlog)
+    endif()
 
     set_target_properties(vulkan PROPERTIES OUTPUT_NAME ${API_TYPE})
 
diff --git a/loader/log.c b/loader/log.c
index 867d93dd..e64fc80c 100644
--- a/loader/log.c
+++ b/loader/log.c
@@ -36,6 +36,10 @@
 #include "loader_environment.h"
 #include "settings.h"
 #include "vk_loader_platform.h"
+#ifdef TIZEN_PLATFORM
+#include <dlog/dlog.h>
+#define LOG_TAG "VK_LOADER"
+#endif
 
 uint32_t g_loader_debug = 0;
 
@@ -219,6 +223,19 @@ void loader_log(const struct loader_instance *inst, VkFlags msg_type, int32_t ms
     OutputDebugString(msg);
     OutputDebugString("\n");
 #endif
+
+#ifdef TIZEN_PLATFORM
+	if ((msg_type & VULKAN_LOADER_ERROR_BIT) != 0) {
+        dlog_print(DLOG_ERROR, LOG_TAG, "%s %s\n", cmd_line_msg, msg);
+    } else if ((msg_type & VULKAN_LOADER_WARN_BIT) != 0) {
+        dlog_print(DLOG_WARN, LOG_TAG, "%s %s\n", cmd_line_msg, msg);
+    } else if ((msg_type & VULKAN_LOADER_INFO_BIT) != 0) {
+        dlog_print(DLOG_INFO, LOG_TAG, "%s %s\n", cmd_line_msg, msg);
+    } else if ((msg_type & VULKAN_LOADER_DEBUG_BIT) != 0) {
+        dlog_print(DLOG_DEBUG, LOG_TAG, "%s %s\n", cmd_line_msg, msg);
+    }
+#endif
+
 }
 
 void loader_log_asm_function_not_supported(const struct loader_instance *inst, VkFlags msg_type, int32_t msg_code,
diff --git a/packaging/vulkan-loader.spec b/packaging/vulkan-loader.spec
index 27393bcd..d1ab6470 100644
--- a/packaging/vulkan-loader.spec
+++ b/packaging/vulkan-loader.spec
@@ -1,5 +1,5 @@
 Name:	    vulkan-loader
-Version:    1.3.240
+Version:    1.3.268
 Release:    0
 Summary:    Vulkan ICD loader
 Group:      Graphics & UI Framework/GL
@@ -14,6 +14,7 @@ BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-cursor)
 BuildRequires:  pkgconfig(wayland-server)
 BuildRequires:  pkgconfig(wayland-egl)
+BuildRequires:  pkgconfig(dlog)
 
 %define BUILD_TYPE Debug
 
@@ -34,7 +35,7 @@ developing applications that use %{name}.
 %build
 cp %{SOURCE1001} .
 export CFLAGS="$CFLAGS -w"
-cmake -DCMAKE_BUILD_TYPE=%{BUILD_TYPE} -DBUILD_TESTS=OFF \
+cmake -DCMAKE_BUILD_TYPE=%{BUILD_TYPE} -DBUILD_TESTS=OFF -DTIZEN_PLATFORM=ON \
       -DBUILD_WSI_XLIB_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=OFF -DBUILD_WSI_WAYLAND_SUPPORT=ON \
       -DCMAKE_INSTALL_LIBDIR=%{_libdir} -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} -DCMAKE_INSTALL_DATADIR=%{_datadir}
 make
@@ -65,4 +66,4 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/{explicit,implicit}_layer.d/ \
 %files devel
 %{_libdir}/pkgconfig/vulkan.pc
 %{_libdir}/*.so
-
+%{_libdir}/cmake/*