misc fixes
continuous-integration/drone/push Build is passing Details

pull/51/head
cosmonaut 2024-02-28 19:57:43 -08:00
parent e88580ae64
commit 75128355ec
1 changed files with 16 additions and 17 deletions

View File

@ -3544,11 +3544,14 @@ static void VULKAN_INTERNAL_DestroyRenderTarget(
NULL NULL
); );
if (renderTarget->msaaTex != NULL)
{
VULKAN_INTERNAL_DestroyTexture( VULKAN_INTERNAL_DestroyTexture(
renderer, renderer,
renderTarget->msaaTex renderTarget->msaaTex
); );
} }
}
static void VULKAN_INTERNAL_DestroyBuffer( static void VULKAN_INTERNAL_DestroyBuffer(
VulkanRenderer* renderer, VulkanRenderer* renderer,
@ -5706,7 +5709,7 @@ static uint32_t VULKAN_INTERNAL_GetRenderTargetIndex(
return return
(level * texture->depth * texture->layerCount) + (level * texture->depth * texture->layerCount) +
(layer * texture->depth) + (layer * texture->depth) +
texture->depth; depth;
} }
static VulkanRenderTarget* VULKAN_INTERNAL_FetchRenderTarget( static VulkanRenderTarget* VULKAN_INTERNAL_FetchRenderTarget(
@ -5802,9 +5805,7 @@ static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
attachmentDescriptions[attachmentDescriptionCount].flags = 0; attachmentDescriptions[attachmentDescriptionCount].flags = 0;
attachmentDescriptions[attachmentDescriptionCount].format = texture->format; attachmentDescriptions[attachmentDescriptionCount].format = texture->format;
attachmentDescriptions[attachmentDescriptionCount].samples = RefreshToVK_SampleCount[ attachmentDescriptions[attachmentDescriptionCount].samples = texture->sampleCount;
texture->sampleCount
];
attachmentDescriptions[attachmentDescriptionCount].loadOp = RefreshToVK_LoadOp[ attachmentDescriptions[attachmentDescriptionCount].loadOp = RefreshToVK_LoadOp[
colorAttachmentInfos[i].loadOp colorAttachmentInfos[i].loadOp
]; ];
@ -5877,9 +5878,8 @@ static VkRenderPass VULKAN_INTERNAL_CreateRenderPass(
attachmentDescriptions[attachmentDescriptionCount].flags = 0; attachmentDescriptions[attachmentDescriptionCount].flags = 0;
attachmentDescriptions[attachmentDescriptionCount].format = texture->format; attachmentDescriptions[attachmentDescriptionCount].format = texture->format;
attachmentDescriptions[attachmentDescriptionCount].samples = RefreshToVK_SampleCount[ attachmentDescriptions[attachmentDescriptionCount].samples = texture->sampleCount;
texture->sampleCount
];
attachmentDescriptions[attachmentDescriptionCount].loadOp = RefreshToVK_LoadOp[ attachmentDescriptions[attachmentDescriptionCount].loadOp = RefreshToVK_LoadOp[
depthStencilAttachmentInfo->loadOp depthStencilAttachmentInfo->loadOp
]; ];
@ -5996,9 +5996,8 @@ static VkRenderPass VULKAN_INTERNAL_CreateTransientRenderPass(
attachmentDescriptions[attachmentDescriptionCount].format = RefreshToVK_SurfaceFormat[ attachmentDescriptions[attachmentDescriptionCount].format = RefreshToVK_SurfaceFormat[
attachmentDescription.format attachmentDescription.format
]; ];
attachmentDescriptions[attachmentDescriptionCount].samples = RefreshToVK_SampleCount[ attachmentDescriptions[attachmentDescriptionCount].samples = sampleCount;
sampleCount
];
attachmentDescriptions[attachmentDescriptionCount].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; attachmentDescriptions[attachmentDescriptionCount].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
attachmentDescriptions[attachmentDescriptionCount].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; attachmentDescriptions[attachmentDescriptionCount].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
attachmentDescriptions[attachmentDescriptionCount].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; attachmentDescriptions[attachmentDescriptionCount].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
@ -6061,9 +6060,8 @@ static VkRenderPass VULKAN_INTERNAL_CreateTransientRenderPass(
renderer, renderer,
attachmentInfo.depthStencilFormat attachmentInfo.depthStencilFormat
); );
attachmentDescriptions[attachmentDescriptionCount].samples = RefreshToVK_SampleCount[ attachmentDescriptions[attachmentDescriptionCount].samples = sampleCount;
sampleCount
];
attachmentDescriptions[attachmentDescriptionCount].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; attachmentDescriptions[attachmentDescriptionCount].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
attachmentDescriptions[attachmentDescriptionCount].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; attachmentDescriptions[attachmentDescriptionCount].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE;
attachmentDescriptions[attachmentDescriptionCount].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; attachmentDescriptions[attachmentDescriptionCount].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
@ -6844,6 +6842,7 @@ static Refresh_Texture* VULKAN_CreateTexture(
container->textureHandles = SDL_malloc( container->textureHandles = SDL_malloc(
container->textureCapacity * sizeof(VulkanTextureHandle*) container->textureCapacity * sizeof(VulkanTextureHandle*)
); );
container->textureHandles[0] = container->activeTextureHandle;
return (Refresh_Texture*) container; return (Refresh_Texture*) container;
} }