Skip to content

Commit d2dbd53

Browse files
Merge pull request #116 from Silverlan/CullModeFlagBits_fix
Fixed inconsistent names for CullModeFlagBits
2 parents f7a6347 + fcb4dba commit d2dbd53

2 files changed

Lines changed: 6 additions & 8 deletions

File tree

include/misc/types_enums.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -646,13 +646,11 @@ namespace Anvil
646646
/* NOTE: These map 1:1 to VK equivalents */
647647
enum class CullModeFlagBits
648648
{
649-
CULL_MODE_BACK_BIT = VK_CULL_MODE_BACK_BIT,
650-
CULL_MODE_FRONT_BIT = VK_CULL_MODE_FRONT_BIT,
651-
CULL_MODE_NONE = VK_CULL_MODE_NONE,
649+
BACK_BIT = VK_CULL_MODE_BACK_BIT,
650+
FRONT_BIT = VK_CULL_MODE_FRONT_BIT,
651+
NONE = VK_CULL_MODE_NONE,
652652

653-
CULL_MODE_FRONT_AND_BACK = VK_CULL_MODE_FRONT_AND_BACK,
654-
655-
NONE = 0
653+
FRONT_AND_BACK = VK_CULL_MODE_FRONT_AND_BACK
656654
};
657655
typedef Anvil::Bitfield<Anvil::CullModeFlagBits, VkCullModeFlags> CullModeFlags;
658656

@@ -1730,4 +1728,4 @@ namespace Anvil
17301728
};
17311729
}; /* namespace Anvil */
17321730

1733-
#endif /* TYPES_ENUMS_H */
1731+
#endif /* TYPES_ENUMS_H */

src/misc/graphics_pipeline_create_info.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Anvil::GraphicsPipelineCreateInfo::GraphicsPipelineCreateInfo(const RenderPass*
7575
0,
7676
sizeof(m_blend_constant) );
7777

78-
m_cull_mode = Anvil::CullModeFlagBits::CULL_MODE_BACK_BIT;
78+
m_cull_mode = Anvil::CullModeFlagBits::BACK_BIT;
7979
m_line_width = 1.0f;
8080
m_min_sample_shading = 1.0f;
8181
m_sample_count = Anvil::SampleCountFlagBits::_1_BIT;

0 commit comments

Comments
 (0)