Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package vkbasalt for openSUSE:Factory
checked in at 2023-01-04 17:54:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vkbasalt (Old)
and /work/SRC/openSUSE:Factory/.vkbasalt.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vkbasalt"
Wed Jan 4 17:54:35 2023 rev:6 rq:1055929 version:0.3.2.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/vkbasalt/vkbasalt.changes 2022-12-13
18:57:40.511910258 +0100
+++ /work/SRC/openSUSE:Factory/.vkbasalt.new.1563/vkbasalt.changes
2023-01-04 17:55:08.303078336 +0100
@@ -1,0 +2,8 @@
+Wed Dec 28 12:40:13 UTC 2022 - Dirk Müller <dmuel...@suse.com>
+
+- update to v0.3.2.8:
+ * fixed regression with multiple effects enabled
+ * fixed compatibility with newer vkd3d-proton by fixing VK_INCOMPLETE
+ handling in vkGetSwapchainImagesKHR
+
+-------------------------------------------------------------------
Old:
----
vkBasalt-0.3.2.6.tar.gz
New:
----
vkBasalt-0.3.2.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vkbasalt.spec ++++++
--- /var/tmp/diff_new_pack.q5AxEa/_old 2023-01-04 17:55:08.679080553 +0100
+++ /var/tmp/diff_new_pack.q5AxEa/_new 2023-01-04 17:55:08.683080576 +0100
@@ -18,7 +18,7 @@
%define __builder ninja
Name: vkbasalt
-Version: 0.3.2.6
+Version: 0.3.2.8
Release: 0
Summary: Vulkan post processing layer
License: Zlib
++++++ vkBasalt-0.3.2.6.tar.gz -> vkBasalt-0.3.2.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vkBasalt-0.3.2.6/README.md
new/vkBasalt-0.3.2.8/README.md
--- old/vkBasalt-0.3.2.6/README.md 2022-07-29 18:25:48.000000000 +0200
+++ new/vkBasalt-0.3.2.8/README.md 2022-12-14 11:49:17.000000000 +0100
@@ -37,14 +37,14 @@
#### 64bit
```
-meson --buildtype=release --prefix=/usr builddir
+meson setup --buildtype=release --prefix=/usr builddir
ninja -C builddir install
```
#### 32bit
Make sure that `PKG_CONFIG_PATH=/usr/lib32/pkgconfig` and `--libdir=lib32` are
correct for your distro and change them if needed. On Debian based distros you
need to replace `lib32` with `lib/i386-linux-gnu`, for example.
```
-ASFLAGS=--32 CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib32/pkgconfig
meson --prefix=/usr --buildtype=release --libdir=lib32 -Dwith_json=false
builddir.32
+ASFLAGS=--32 CFLAGS=-m32 CXXFLAGS=-m32 PKG_CONFIG_PATH=/usr/lib32/pkgconfig
meson setup --prefix=/usr --buildtype=release --libdir=lib32 -Dwith_json=false
builddir.32
ninja -C builddir.32 install
```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vkBasalt-0.3.2.6/src/basalt.cpp
new/vkBasalt-0.3.2.8/src/basalt.cpp
--- old/vkBasalt-0.3.2.6/src/basalt.cpp 2022-07-29 18:25:48.000000000 +0200
+++ new/vkBasalt-0.3.2.8/src/basalt.cpp 2022-12-14 11:49:17.000000000 +0100
@@ -375,29 +375,24 @@
// If the images got already requested once, return them again instead
of creating new images
if (pLogicalSwapchain->fakeImages.size())
{
+ *pCount = std::min<uint32_t>(*pCount,
pLogicalSwapchain->imageCount);
std::memcpy(pSwapchainImages,
pLogicalSwapchain->fakeImages.data(), sizeof(VkImage) * (*pCount));
- return VK_SUCCESS;
+ return *pCount < pLogicalSwapchain->imageCount ? VK_INCOMPLETE :
VK_SUCCESS;
}
- pLogicalSwapchain->imageCount = *pCount;
- pLogicalSwapchain->images.reserve(*pCount);
+ pLogicalDevice->vkd.GetSwapchainImagesKHR(device, swapchain,
&pLogicalSwapchain->imageCount, nullptr);
+ pLogicalSwapchain->images.resize(pLogicalSwapchain->imageCount);
+ pLogicalDevice->vkd.GetSwapchainImagesKHR(device, swapchain,
&pLogicalSwapchain->imageCount, pLogicalSwapchain->images.data());
std::vector<std::string> effectStrings =
pConfig->getOption<std::vector<std::string>>("effects", {"cas"});
// create 1 more set of images when we can't use the swapchain it self
- uint32_t fakeImageCount = *pCount * (effectStrings.size() +
!pLogicalDevice->supportsMutableFormat);
+ uint32_t fakeImageCount = pLogicalSwapchain->imageCount *
(effectStrings.size() + !pLogicalDevice->supportsMutableFormat);
pLogicalSwapchain->fakeImages =
createFakeSwapchainImages(pLogicalDevice,
pLogicalSwapchain->swapchainCreateInfo, fakeImageCount,
pLogicalSwapchain->fakeImageMemory);
Logger::debug("created fake swapchain images");
- VkResult result = pLogicalDevice->vkd.GetSwapchainImagesKHR(device,
swapchain, pCount, pSwapchainImages);
- for (unsigned int i = 0; i < *pCount; i++)
- {
- pLogicalSwapchain->images.push_back(pSwapchainImages[i]);
- pSwapchainImages[i] = pLogicalSwapchain->fakeImages[i];
- }
-
VkFormat unormFormat = convertToUNORM(pLogicalSwapchain->format);
VkFormat srgbFormat = convertToSRGB(pLogicalSwapchain->format);
@@ -528,7 +523,9 @@
Logger::debug(std::to_string(i) + " written commandbuffer " +
convertToString(pLogicalSwapchain->commandBuffersNoEffect[i]));
}
- return result;
+ *pCount = std::min<uint32_t>(*pCount, pLogicalSwapchain->imageCount);
+ std::memcpy(pSwapchainImages, pLogicalSwapchain->fakeImages.data(),
sizeof(VkImage) * (*pCount));
+ return *pCount < pLogicalSwapchain->imageCount ? VK_INCOMPLETE :
VK_SUCCESS;
}
VKAPI_ATTR VkResult VKAPI_CALL vkBasalt_QueuePresentKHR(VkQueue queue,
const VkPresentInfoKHR* pPresentInfo)
