hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename a value.

Browse Source
This commit is contained in:
hyzboy 2020-09-18 17:24:28 +08:00
parent 5df8466cc8
commit b42ad2d667
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
inc/hgl/graph/vulkan/VKPipeline.h
View File

@ -58,7 +58,7 @@ class PipelineCreater
VkPipelineRasterizationStateCreateInfo rasterizer; VkPipelineRasterizationStateCreateInfo rasterizer;
VkPipelineMultisampleStateCreateInfo multisampling; VkPipelineMultisampleStateCreateInfo multisample;
VkSampleMask sample_mask[MAX_SAMPLE_MASK_COUNT]; VkSampleMask sample_mask[MAX_SAMPLE_MASK_COUNT];
VkPipelineDepthStencilStateCreateInfo depthStencilState; VkPipelineDepthStencilStateCreateInfo depthStencilState;
@ -118,8 +118,8 @@ public:
void SetSamleCount( VkSampleCountFlagBits sc) void SetSamleCount( VkSampleCountFlagBits sc)
{ {
multisampling.sampleShadingEnable=(sc==VK_SAMPLE_COUNT_1_BIT?VK_FALSE:VK_TRUE); multisample.sampleShadingEnable=(sc==VK_SAMPLE_COUNT_1_BIT?VK_FALSE:VK_TRUE);
multisampling.rasterizationSamples=sc; multisample.rasterizationSamples=sc;
} }
bool SetColorWriteMask(uint index,bool r,bool g,bool b,bool a) bool SetColorWriteMask(uint index,bool r,bool g,bool b,bool a)

6
src/RenderDevice/Vulkan/POD/VKPipelineCreateInfo.POD.cpp
View File

@ -66,7 +66,7 @@ bool PipelineCreater::LoadFromMemory(uchar *data,uint size)
CHECK_SIZE_AND_COPY(tessellation,VkPipelineTessellationStateCreateInfo); CHECK_SIZE_AND_COPY(tessellation,VkPipelineTessellationStateCreateInfo);
CHECK_SIZE_AND_COPY(rasterizer,VkPipelineRasterizationStateCreateInfo); CHECK_SIZE_AND_COPY(rasterizer,VkPipelineRasterizationStateCreateInfo);
CHECK_SIZE_AND_COPY(multisampling,VkPipelineMultisampleStateCreateInfo); CHECK_SIZE_AND_COPY(multisample,VkPipelineMultisampleStateCreateInfo);
const uint8 count=*(uint8 *)data; const uint8 count=*(uint8 *)data;
++data; ++data;
@ -74,13 +74,13 @@ bool PipelineCreater::LoadFromMemory(uchar *data,uint size)
if(count>0) if(count>0)
{ {
memcpy(sample_mask,data,count); memcpy(sample_mask,data,count);
multisampling.pSampleMask=sample_mask; multisample.pSampleMask=sample_mask;
data+=count; data+=count;
size=count; size=count;
} }
else else
{ {
multisampling.pSampleMask=nullptr; multisample.pSampleMask=nullptr;
} }
CHECK_SIZE_AND_COPY(depthStencilState,VkPipelineDepthStencilStateCreateInfo); CHECK_SIZE_AND_COPY(depthStencilState,VkPipelineDepthStencilStateCreateInfo);

22
src/RenderDevice/Vulkan/VKPipeline.cpp
View File

@ -104,17 +104,17 @@ PipelineCreater::PipelineCreater(Device *dev,const Material *material,const uint
pipelineInfo.pRasterizationState = &rasterizer; pipelineInfo.pRasterizationState = &rasterizer;
multisampling.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; multisample.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO;
multisampling.pNext = nullptr; multisample.pNext = nullptr;
multisampling.flags = 0; multisample.flags = 0;
multisampling.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; multisample.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT;
multisampling.sampleShadingEnable = VK_FALSE; multisample.sampleShadingEnable = VK_FALSE;
multisampling.minSampleShading = 0.0; multisample.minSampleShading = 0.0;
multisampling.pSampleMask = nullptr; multisample.pSampleMask = nullptr;
multisampling.alphaToCoverageEnable = VK_FALSE; multisample.alphaToCoverageEnable = VK_FALSE;
multisampling.alphaToOneEnable = VK_FALSE; multisample.alphaToOneEnable = VK_FALSE;
pipelineInfo.pMultisampleState = &multisampling; pipelineInfo.pMultisampleState = &multisample;
depthStencilState.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO; depthStencilState.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO;
depthStencilState.pNext = nullptr; depthStencilState.pNext = nullptr;
@ -188,7 +188,7 @@ PipelineCreater::PipelineCreater(Device *dev,const Material *material,uchar *dat
pipelineInfo.pInputAssemblyState=&inputAssembly; pipelineInfo.pInputAssemblyState=&inputAssembly;
pipelineInfo.pTessellationState =&tessellation; pipelineInfo.pTessellationState =&tessellation;
pipelineInfo.pRasterizationState=&rasterizer; pipelineInfo.pRasterizationState=&rasterizer;
pipelineInfo.pMultisampleState =&multisampling; pipelineInfo.pMultisampleState =&multisample;
pipelineInfo.pDepthStencilState =&depthStencilState; pipelineInfo.pDepthStencilState =&depthStencilState;
pipelineInfo.pColorBlendState =&colorBlending; pipelineInfo.pColorBlendState =&colorBlending;