TheSpydog
/
Refresh
forked from MoonsideGames/Refresh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

misc fixes

submit_rewrite
cosmonaut 2020-12-22 20:22:17 -08:00
parent a795e1f825
commit a586040123
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/Refresh.h
View File

@ -550,15 +550,15 @@ typedef struct REFRESH_ColorBlendState
typedef struct REFRESH_GraphicsPipelineCreateInfo typedef struct REFRESH_GraphicsPipelineCreateInfo
{ {
const REFRESH_ShaderStageState vertexShaderState; REFRESH_ShaderStageState vertexShaderState;
const REFRESH_ShaderStageState fragmentShaderState; REFRESH_ShaderStageState fragmentShaderState;
const REFRESH_VertexInputState vertexInputState; REFRESH_VertexInputState vertexInputState;
const REFRESH_TopologyState topologyState; REFRESH_TopologyState topologyState;
const REFRESH_ViewportState viewportState; REFRESH_ViewportState viewportState;
const REFRESH_RasterizerState rasterizerState; REFRESH_RasterizerState rasterizerState;
const REFRESH_MultisampleState multisampleState; REFRESH_MultisampleState multisampleState;
const REFRESH_DepthStencilState depthStencilState; REFRESH_DepthStencilState depthStencilState;
const REFRESH_ColorBlendState colorBlendState; REFRESH_ColorBlendState colorBlendState;
REFRESH_PipelineLayoutCreateInfo pipelineLayoutCreateInfo; REFRESH_PipelineLayoutCreateInfo pipelineLayoutCreateInfo;
REFRESH_RenderPass *renderPass; REFRESH_RenderPass *renderPass;
} REFRESH_GraphicsPipelineCreateInfo; } REFRESH_GraphicsPipelineCreateInfo;

6
src/Refresh_Driver_Vulkan.c
View File

@ -2117,7 +2117,7 @@ static uint8_t VULKAN_INTERNAL_CreateBuffer(
} }
buffer->subBuffers[i]->resourceAccessType = resourceAccessType; buffer->subBuffers[i]->resourceAccessType = resourceAccessType;
buffer->subBuffers[i]->bound = -1; buffer->subBuffers[i]->bound = 0;
VULKAN_INTERNAL_BufferMemoryBarrier( VULKAN_INTERNAL_BufferMemoryBarrier(
renderer, renderer,
@ -2976,6 +2976,8 @@ static REFRESH_GraphicsPipeline* VULKAN_CreateGraphicsPipeline(
pipelineLayoutCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO; pipelineLayoutCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
pipelineLayoutCreateInfo.pNext = NULL; pipelineLayoutCreateInfo.pNext = NULL;
pipelineLayoutCreateInfo.flags = 0; pipelineLayoutCreateInfo.flags = 0;
pipelineLayoutCreateInfo.pPushConstantRanges = NULL;
pipelineLayoutCreateInfo.pushConstantRangeCount = 0;
pipelineLayoutCreateInfo.setLayoutCount = 4; pipelineLayoutCreateInfo.setLayoutCount = 4;
pipelineLayoutCreateInfo.pSetLayouts = setLayouts; pipelineLayoutCreateInfo.pSetLayouts = setLayouts;
@ -2995,6 +2997,7 @@ static REFRESH_GraphicsPipeline* VULKAN_CreateGraphicsPipeline(
/* Pipeline */ /* Pipeline */
vkPipelineCreateInfo.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO; vkPipelineCreateInfo.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO;
vkPipelineCreateInfo.pNext = NULL;
vkPipelineCreateInfo.flags = 0; vkPipelineCreateInfo.flags = 0;
vkPipelineCreateInfo.stageCount = 2; vkPipelineCreateInfo.stageCount = 2;
vkPipelineCreateInfo.pStages = shaderStageCreateInfos; vkPipelineCreateInfo.pStages = shaderStageCreateInfos;
@ -4679,7 +4682,6 @@ static void VULKAN_BindGraphicsPipeline(
VK_PIPELINE_BIND_POINT_GRAPHICS, VK_PIPELINE_BIND_POINT_GRAPHICS,
pipeline->pipeline pipeline->pipeline
)); ));
SDL_assert(0);
} }
static void VULKAN_INTERNAL_MarkAsBound( static void VULKAN_INTERNAL_MarkAsBound(