maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logging/header path changes

Browse Source
This commit is contained in:
Nick Fisher
2025-04-16 13:34:45 +08:00
parent 2bd64805a9
commit 7dfb8a4b19
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
thermion_dart/native/src/windows/vulkan/vulkan_texture.cpp
View File

@@ -1,7 +1,7 @@
#include "vulkan_texture.h" #include "vulkan_texture.h"
#include "bluevk/BlueVK.h" #include "bluevk/BlueVK.h"
#include "utils.h" #include "vulkan_utils.h"
#include "Log.hpp"
#include <iostream> #include <iostream>
namespace thermion::windows::vulkan namespace thermion::windows::vulkan
@@ -23,7 +23,12 @@ namespace thermion::windows::vulkan
} }
std::unique_ptr<VulkanTexture> VulkanTexture::create(VkDevice device, VkPhysicalDevice physicalDevice, uint32_t width, uint32_t height, HANDLE d3dTextureHandle) std::unique_ptr<VulkanTexture> VulkanTexture::create(
VkDevice device,
VkPhysicalDevice physicalDevice,
uint32_t width,
uint32_t height,
HANDLE d3dTextureHandle)
{ {
// Create image with external memory support // Create image with external memory support
VkExternalMemoryImageCreateInfo extImageInfo = { VkExternalMemoryImageCreateInfo extImageInfo = {
@@ -67,9 +72,8 @@ namespace thermion::windows::vulkan
.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2, .sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2,
.pNext = nullptr, .pNext = nullptr,
.image = image}; .image = image};
// WARN: Memory access violation unless validation instance layer is enabled, otherwise success but...
bluevk::vkGetImageMemoryRequirements2(device, &ImageMemoryRequirementsInfo2, &MemoryRequirements2); bluevk::vkGetImageMemoryRequirements2(device, &ImageMemoryRequirementsInfo2, &MemoryRequirements2);
// ... if we happen to be here, MemoryRequirements2 is empty
VkMemoryRequirements &MemoryRequirements = MemoryRequirements2.memoryRequirements; VkMemoryRequirements &MemoryRequirements = MemoryRequirements2.memoryRequirements;
const VkMemoryDedicatedAllocateInfo MemoryDedicatedAllocateInfo{ const VkMemoryDedicatedAllocateInfo MemoryDedicatedAllocateInfo{
@@ -102,6 +106,9 @@ namespace thermion::windows::vulkan
VkDeviceMemory imageMemory = VK_NULL_HANDLE; VkDeviceMemory imageMemory = VK_NULL_HANDLE;
VkResult allocResult = bluevk::vkAllocateMemory(device, &allocInfo, nullptr, &imageMemory); VkResult allocResult = bluevk::vkAllocateMemory(device, &allocInfo, nullptr, &imageMemory);
if(imageMemory == VK_NULL_HANDLE) {
ERROR("imageMemory == VK_NULL_HANDLE");
}
if (allocResult != VK_SUCCESS || imageMemory == VK_NULL_HANDLE) if (allocResult != VK_SUCCESS || imageMemory == VK_NULL_HANDLE)
{ {
std::cout << "IMAGE MEMORY ALLOCATION FAILED:" << std::endl; std::cout << "IMAGE MEMORY ALLOCATION FAILED:" << std::endl;