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

replace topologyState with primitiveType

submit_rewrite
cosmonaut 2021-01-13 21:06:20 -08:00
parent b25daa5198
commit 79bc36d99d
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/Refresh.h
View File

@ -528,12 +528,6 @@ typedef struct Refresh_ShaderStageState
uint64_t uniformBufferSize; uint64_t uniformBufferSize;
} Refresh_ShaderStageState; } Refresh_ShaderStageState;
/* FIXME: this is awkwardly named */
typedef struct Refresh_TopologyState
{
Refresh_PrimitiveType topology;
} Refresh_TopologyState;
typedef struct Refresh_ViewportState typedef struct Refresh_ViewportState
{ {
const Refresh_Viewport *viewports; const Refresh_Viewport *viewports;
@ -594,7 +588,7 @@ typedef struct Refresh_GraphicsPipelineCreateInfo
Refresh_ShaderStageState vertexShaderState; Refresh_ShaderStageState vertexShaderState;
Refresh_ShaderStageState fragmentShaderState; Refresh_ShaderStageState fragmentShaderState;
Refresh_VertexInputState vertexInputState; Refresh_VertexInputState vertexInputState;
Refresh_TopologyState topologyState; Refresh_PrimitiveType primitiveType;
Refresh_ViewportState viewportState; Refresh_ViewportState viewportState;
Refresh_RasterizerState rasterizerState; Refresh_RasterizerState rasterizerState;
Refresh_MultisampleState multisampleState; Refresh_MultisampleState multisampleState;

4
src/Refresh_Driver_Vulkan.c
View File

@ -4705,10 +4705,10 @@ static Refresh_GraphicsPipeline* VULKAN_CreateGraphicsPipeline(
inputAssemblyStateCreateInfo.flags = 0; inputAssemblyStateCreateInfo.flags = 0;
inputAssemblyStateCreateInfo.primitiveRestartEnable = VK_FALSE; inputAssemblyStateCreateInfo.primitiveRestartEnable = VK_FALSE;
inputAssemblyStateCreateInfo.topology = RefreshToVK_PrimitiveType[ inputAssemblyStateCreateInfo.topology = RefreshToVK_PrimitiveType[
pipelineCreateInfo->topologyState.topology pipelineCreateInfo->primitiveType
]; ];
graphicsPipeline->primitiveType = pipelineCreateInfo->topologyState.topology; graphicsPipeline->primitiveType = pipelineCreateInfo->primitiveType;
/* Viewport */ /* Viewport */