Dynamically allocate Vulkan output window swapchain arrays #3524
Conversation
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
baldurk
requested changes
Jan 27, 2025
renderdoc/driver/vulkan/vk_replay.h
Outdated
| @@ -550,7 +550,7 @@ class VulkanReplay : public IReplayDriver | |||
| VkSurfaceKHR surface; | |||
| VkSwapchainKHR swap; | |||
| uint32_t numImgs; | |||
| VkImage colimg[8]; | |||
| VkImage colimg[12]; | |||
| VkImageMemoryBarrier colBarrier[8]; | |||
There was a problem hiding this comment.
You haven't changed the size of colBarrier here so you're indexing out of bounds. At this point these should be replaced with rdcarray<VkImage> and rdcarray<VkImageMemoryBarrier> and resized properly (there was no reason to before really, it was probably just early bootstrap hardcoded max that never got changed because drivers were usually sane).
MartynJacques-Arm
force-pushed
the
v1.x
branch
from
3ccce9f to
5c8cd18
Compare
baldurk
requested changes
Jan 28, 2025
|
|
||
| VkImage *imgs = new VkImage[numImgs]; | ||
| vkr = vt->GetSwapchainImagesKHR(Unwrap(device), Unwrap(swap), &numImgs, imgs); | ||
| CHECK_VKR(driver, vkr); | ||
|
|
||
| colimg.reserve(numImgs); | ||
| colBarrier.reserve(numImgs); |
There was a problem hiding this comment.
reserve is not the correct call to make here. This isn't immediately broken because it still allocates the memory. The rdcarray functions are named identically to vector - you should call resize.
MartynJacques-Arm
force-pushed
the
v1.x
branch
from
5c8cd18 to
6baaba1
Compare
MartynJacques-Arm
force-pushed
the
v1.x
branch
from
95066a7 to
8141d35
Compare
MartynJacques-Arm
changed the title
baldurk
requested changes
Feb 6, 2025
Vivo X90 devices provide 11 swapchain images. Dynamically allocate output window arrays to handle this.
MartynJacques-Arm
force-pushed
the
v1.x
branch
from
8141d35 to
6c03fb6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Vivo X90 devices provide 11 swapchain images, increase the Vulkan OutputWindow properties to handle this