forked from MoonsideGames/Refresh
Compare commits
No commits in common. "2706b6fe43c5e26ab437ef70cd8b8fa86eceaa3b" and "5166ae87b20e4f7fe98ec4e2b4082e591ea798f2" have entirely different histories.
2706b6fe43
...
5166ae87b2
|
@ -5446,7 +5446,7 @@ static VulkanRenderTarget* VULKAN_INTERNAL_CreateRenderTarget(
|
||||||
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT
|
VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT
|
||||||
);
|
);
|
||||||
|
|
||||||
renderTarget->multisampleCount = RefreshToVK_SampleCount[multisampleCount];
|
renderTarget->multisampleCount = multisampleCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* create framebuffer compatible views for RenderTarget */
|
/* create framebuffer compatible views for RenderTarget */
|
||||||
|
@ -5810,9 +5810,7 @@ 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 = VK_SAMPLE_COUNT_1_BIT;
|
||||||
attachmentDescription.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;
|
||||||
|
@ -8309,7 +8307,6 @@ static void VULKAN_BeginRenderPass(
|
||||||
VulkanTexture *texture;
|
VulkanTexture *texture;
|
||||||
VkClearValue *clearValues;
|
VkClearValue *clearValues;
|
||||||
uint32_t clearCount = colorAttachmentCount;
|
uint32_t clearCount = colorAttachmentCount;
|
||||||
uint32_t multisampleAttachmentCount = 0;
|
|
||||||
uint32_t i;
|
uint32_t i;
|
||||||
VkImageAspectFlags depthAspectFlags;
|
VkImageAspectFlags depthAspectFlags;
|
||||||
Refresh_Viewport defaultViewport;
|
Refresh_Viewport defaultViewport;
|
||||||
|
@ -8396,12 +8393,6 @@ static void VULKAN_BeginRenderPass(
|
||||||
&texture->resourceAccessType
|
&texture->resourceAccessType
|
||||||
);
|
);
|
||||||
|
|
||||||
if (colorAttachmentInfos[i].sampleCount > 1)
|
|
||||||
{
|
|
||||||
clearCount += 1;
|
|
||||||
multisampleAttachmentCount += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
VULKAN_INTERNAL_TrackTexture(renderer, vulkanCommandBuffer, texture);
|
VULKAN_INTERNAL_TrackTexture(renderer, vulkanCommandBuffer, texture);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8439,21 +8430,12 @@ static void VULKAN_BeginRenderPass(
|
||||||
|
|
||||||
clearValues = SDL_stack_alloc(VkClearValue, clearCount);
|
clearValues = SDL_stack_alloc(VkClearValue, clearCount);
|
||||||
|
|
||||||
for (i = 0; i < colorAttachmentCount + multisampleAttachmentCount; i += 1)
|
for (i = 0; i < colorAttachmentCount; i += 1)
|
||||||
{
|
{
|
||||||
clearValues[i].color.float32[0] = colorAttachmentInfos[i].clearColor.x;
|
clearValues[i].color.float32[0] = colorAttachmentInfos[i].clearColor.x;
|
||||||
clearValues[i].color.float32[1] = colorAttachmentInfos[i].clearColor.y;
|
clearValues[i].color.float32[1] = colorAttachmentInfos[i].clearColor.y;
|
||||||
clearValues[i].color.float32[2] = colorAttachmentInfos[i].clearColor.z;
|
clearValues[i].color.float32[2] = colorAttachmentInfos[i].clearColor.z;
|
||||||
clearValues[i].color.float32[3] = colorAttachmentInfos[i].clearColor.w;
|
clearValues[i].color.float32[3] = colorAttachmentInfos[i].clearColor.w;
|
||||||
|
|
||||||
if (colorAttachmentInfos[i].sampleCount > 0)
|
|
||||||
{
|
|
||||||
i += 1;
|
|
||||||
clearValues[i].color.float32[0] = colorAttachmentInfos[i].clearColor.x;
|
|
||||||
clearValues[i].color.float32[1] = colorAttachmentInfos[i].clearColor.y;
|
|
||||||
clearValues[i].color.float32[2] = colorAttachmentInfos[i].clearColor.z;
|
|
||||||
clearValues[i].color.float32[3] = colorAttachmentInfos[i].clearColor.w;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (depthStencilAttachmentInfo != NULL)
|
if (depthStencilAttachmentInfo != NULL)
|
||||||
|
@ -10567,7 +10549,6 @@ static uint8_t VULKAN_INTERNAL_CreateLogicalDevice(
|
||||||
deviceFeatures.occlusionQueryPrecise = VK_TRUE;
|
deviceFeatures.occlusionQueryPrecise = VK_TRUE;
|
||||||
deviceFeatures.fillModeNonSolid = VK_TRUE;
|
deviceFeatures.fillModeNonSolid = VK_TRUE;
|
||||||
deviceFeatures.depthClamp = VK_TRUE;
|
deviceFeatures.depthClamp = VK_TRUE;
|
||||||
deviceFeatures.samplerAnisotropy = VK_TRUE;
|
|
||||||
|
|
||||||
/* creating the logical device */
|
/* creating the logical device */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue