Merge pull request #115 from Silverlan/master

DominikWitczakAMD · web-flow · commit 15d135314cce · 2018-10-26T12:55:40.000+02:00
Fixed GraphicsPipelineCreateInfo::create taking a parameter of type PipelineCreateFlagBits instead of PipelineCreateFlags
diff --git a/include/misc/graphics_pipeline_create_info.h b/include/misc/graphics_pipeline_create_info.h
@@ -31,7 +31,7 @@ namespace Anvil
     {
     public:
         /* Public functions */
-        static Anvil::GraphicsPipelineCreateInfoUniquePtr create      (const Anvil::PipelineCreateFlagBits&     in_create_flags,
+        static Anvil::GraphicsPipelineCreateInfoUniquePtr create      (const Anvil::PipelineCreateFlags&     in_create_flags,
                                                                        const RenderPass*                        in_renderpass_ptr,
                                                                        SubPassID                                in_subpass_id,
                                                                        const ShaderModuleStageEntryPoint&       in_fragment_shader_stage_entrypoint_info,
diff --git a/src/misc/graphics_pipeline_create_info.cpp b/src/misc/graphics_pipeline_create_info.cpp
@@ -234,7 +234,7 @@ bool Anvil::GraphicsPipelineCreateInfo::copy_gfx_state_from(const Anvil::Graphic
     return result;
 }
 
-Anvil::GraphicsPipelineCreateInfoUniquePtr Anvil::GraphicsPipelineCreateInfo::create(const Anvil::PipelineCreateFlagBits&     in_create_flags,
+Anvil::GraphicsPipelineCreateInfoUniquePtr Anvil::GraphicsPipelineCreateInfo::create(const Anvil::PipelineCreateFlags&     in_create_flags,
                                                                                      const RenderPass*                        in_renderpass_ptr,
                                                                                      SubPassID                                in_subpass_id,
                                                                                      const ShaderModuleStageEntryPoint&       in_fragment_shader_stage_entrypoint_info,

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ namespace Anvil`
`31`	`31`	`{`
`32`	`32`	`public:`
`33`	`33`	`/* Public functions */`
`34`		`- static Anvil::GraphicsPipelineCreateInfoUniquePtr create (const Anvil::PipelineCreateFlagBits& in_create_flags,`
	`34`	`+ static Anvil::GraphicsPipelineCreateInfoUniquePtr create (const Anvil::PipelineCreateFlags& in_create_flags,`
`35`	`35`	`const RenderPass* in_renderpass_ptr,`
`36`	`36`	`SubPassID in_subpass_id,`
`37`	`37`	`const ShaderModuleStageEntryPoint& in_fragment_shader_stage_entrypoint_info,`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ bool Anvil::GraphicsPipelineCreateInfo::copy_gfx_state_from(const Anvil::Graphic`
`234`	`234`	`return result;`
`235`	`235`	`}`
`236`	`236`
`237`		`-Anvil::GraphicsPipelineCreateInfoUniquePtr Anvil::GraphicsPipelineCreateInfo::create(const Anvil::PipelineCreateFlagBits& in_create_flags,`
	`237`	`+Anvil::GraphicsPipelineCreateInfoUniquePtr Anvil::GraphicsPipelineCreateInfo::create(const Anvil::PipelineCreateFlags& in_create_flags,`
`238`	`238`	`const RenderPass* in_renderpass_ptr,`
`239`	`239`	`SubPassID in_subpass_id,`
`240`	`240`	`const ShaderModuleStageEntryPoint& in_fragment_shader_stage_entrypoint_info,`