Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions host/vulkan/vk_common_operations.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2363,19 +2363,21 @@ bool VkEmulation::allocExternalMemory(VulkanDispatch* vk, VkEmulation::ExternalM

// Check that there is a memoryType that covers both the VkImage and the
// screenBuffer memory requirements
const uint32_t combinedMemoryTypeBits =
uint32_t combinedMemoryTypeBits =
screenBufferProps.memoryTypeBits & cbInfoPtr->imageMemReqs.memoryTypeBits;
if (!combinedMemoryTypeBits) {
GFXSTREAM_ERROR(
"There is no common memory type for both screenBuffer requirements (0x%x) "
"and VkImage requirements (0x%x) for ColorBuffer: %d",
GFXSTREAM_WARNING(
"WARNING -- There is no common memory type for both screenBuffer "
"requirements (0x%x) "
"and VkImage requirements (0x%x) for ColorBuffer: %d. Defaulting to "
"selection based of the Screen Buffer's memoryTypeBits on their own.",
screenBufferProps.memoryTypeBits, cbInfoPtr->imageMemReqs.memoryTypeBits,
cbInfoPtr->handle);
Comment thread
aaron-ruby marked this conversation as resolved.
return false;
combinedMemoryTypeBits = screenBufferProps.memoryTypeBits;
}
Comment thread
aaron-ruby marked this conversation as resolved.
// Update the memory type:
info->typeIndex = getValidMemoryTypeIndex(screenBufferProps.memoryTypeBits,
cbInfoPtr->memoryProperty);
info->typeIndex =
getValidMemoryTypeIndex(combinedMemoryTypeBits, cbInfoPtr->memoryProperty);
allocInfo.memoryTypeIndex = info->typeIndex;

info->qnxScreenStreamHandle = screenStreamBuffer->first;
Expand Down
Loading