-
Notifications
You must be signed in to change notification settings - Fork 741
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
games/warzone2100: fix upstream patch handling
Instead of using PATCHFILES, handle backported upstream commit as a patch under files/, where it is always available, manageable and where it doesn't break when patch format changes. Pointyhat to: jbeich
- Loading branch information
Showing
3 changed files
with
49 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,3 @@ | ||
TIMESTAMP = 1618939913 | ||
SHA256 (warzone2100-4.0.1/warzone2100_src.tar.xz) = 337622d5f813bbc1f9a3b4fee0874fcc074806781cfa9c25a252534ddd240ab9 | ||
SIZE (warzone2100-4.0.1/warzone2100_src.tar.xz) = 337713608 | ||
SHA256 (warzone2100-4.0.1/5e6fdab3feac.patch) = 579ffd85c09ffca615a9c90cb07d1021d7dc58fe12dffed8c7e5602cdaa8ca7d | ||
SIZE (warzone2100-4.0.1/5e6fdab3feac.patch) = 1737 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
From 5e6fdab3feac55357bcaedcb03ef619d23d3277f Mon Sep 17 00:00:00 2001 | ||
From: past-due <30942300+past-due@users.noreply.github.com> | ||
Date: Sat, 4 Dec 2021 11:22:24 -0500 | ||
Subject: [PATCH] [Vulkan] Add missing vk:: namespace to `throwResultException` | ||
|
||
--- | ||
lib/ivis_opengl/gfx_api_vk.cpp | 8 ++++---- | ||
1 file changed, 4 insertions(+), 4 deletions(-) | ||
|
||
diff --git a/lib/ivis_opengl/gfx_api_vk.cpp b/lib/ivis_opengl/gfx_api_vk.cpp | ||
index 594d127f70..419b8a7644 100644 | ||
--- lib/ivis_opengl/gfx_api_vk.cpp | ||
+++ lib/ivis_opengl/gfx_api_vk.cpp | ||
@@ -477,7 +477,7 @@ void BlockBufferAllocator::allocateNewBlock(uint32_t minimumSize) | ||
if (result != vk::Result::eSuccess) | ||
{ | ||
// Failed to allocate memory! | ||
- throwResultException( result, "vmaCreateBuffer" ); | ||
+ vk::throwResultException( result, "vmaCreateBuffer" ); | ||
} | ||
|
||
if (autoMap) | ||
@@ -1304,7 +1304,7 @@ VkPSO::VkPSO(vk::Device _dev, | ||
object = std::move(result.value); | ||
break; | ||
default: | ||
- throwResultException(result.result, "createGraphicsPipeline"); | ||
+ vk::throwResultException(result.result, "createGraphicsPipeline"); | ||
} | ||
} | ||
|
||
@@ -1368,7 +1368,7 @@ void VkBuf::allocateBufferObject(const std::size_t& size) | ||
if (result != vk::Result::eSuccess) | ||
{ | ||
// Failed to allocate memory! | ||
- throwResultException( result, "vmaCreateBuffer" ); | ||
+ vk::throwResultException( result, "vmaCreateBuffer" ); | ||
} | ||
|
||
buffer_size = size; | ||
@@ -1486,7 +1486,7 @@ VkTexture::VkTexture(const VkRoot& root, const std::size_t& mipmap_count, const | ||
if (result != vk::Result::eSuccess) | ||
{ | ||
// Failed to allocate memory! | ||
- throwResultException( result, "vmaCreateImage" ); | ||
+ vk::throwResultException( result, "vmaCreateImage" ); | ||
} | ||
|
||
const auto imageViewCreateInfo = vk::ImageViewCreateInfo() |