alex/portability
1
0
Fork 0
mirror of https://github.com/italicsjenga/portability.git synced 2024-11-22 23:11:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge #96

Browse source 
96: Transmute enum values r=kvark a=grovesNL

Transmutes enum values instead of matching, also adds mapping for stencil op and logic op.

Depends on gfx-rs/gfx#2132

Co-authored-by: Joshua Groves <josh@joshgroves.com>
This commit is contained in:
bors[bot] 2018-06-09 15:50:03 +00:00
parent 7fc8ef378b 694474f46c
commit 2a03ef2acd
1 changed files with 18 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
libportability-gfx/src/conv.rs
View file

@ -37,6 +37,7 @@ pub fn limits_from_hal(limits: Limits) -> VkPhysicalDeviceLimits {
} }
} }
#[inline]
pub fn format_from_hal(format: format::Format) -> VkFormat { pub fn format_from_hal(format: format::Format) -> VkFormat {
// HAL formats have the same numeric representation as Vulkan formats // HAL formats have the same numeric representation as Vulkan formats
unsafe { mem::transmute(format) } unsafe { mem::transmute(format) }
@ -560,60 +561,34 @@ pub fn map_primitive_topology(topology: VkPrimitiveTopology, patch_size: PatchSi
}) })
} }
#[inline]
pub fn map_compare_op(op: VkCompareOp) -> pso::Comparison { pub fn map_compare_op(op: VkCompareOp) -> pso::Comparison {
use super::VkCompareOp::*; // Vulkan and HAL values are equal
unsafe { mem::transmute(op as u8) }
match op {
VK_COMPARE_OP_NEVER => pso::Comparison::Never,
VK_COMPARE_OP_LESS => pso::Comparison::Less,
VK_COMPARE_OP_EQUAL => pso::Comparison::Equal,
VK_COMPARE_OP_LESS_OR_EQUAL => pso::Comparison::LessEqual,
VK_COMPARE_OP_GREATER => pso::Comparison::Greater,
VK_COMPARE_OP_NOT_EQUAL => pso::Comparison::NotEqual,
VK_COMPARE_OP_GREATER_OR_EQUAL => pso::Comparison::GreaterEqual,
VK_COMPARE_OP_ALWAYS => pso::Comparison::Always,
_ => panic!("Unexpected compare op: {:?}", op),
}
} }
pub fn map_logic_op(_op: VkLogicOp) -> pso::LogicOp { #[inline]
unimplemented!() pub fn map_logic_op(op: VkLogicOp) -> pso::LogicOp {
// Vulkan and HAL values are equal
unsafe { mem::transmute(op as u8) }
} }
pub fn map_stencil_op(_op: VkStencilOp) -> pso::StencilOp { #[inline]
unimplemented!() pub fn map_stencil_op(op: VkStencilOp) -> pso::StencilOp {
// Vulkan and HAL values are equal
unsafe { mem::transmute(op as u8) }
} }
#[inline]
pub fn map_color_components(mask: VkColorComponentFlags) -> pso::ColorMask { pub fn map_color_components(mask: VkColorComponentFlags) -> pso::ColorMask {
// Vulkan and HAL flags are equal // Vulkan and HAL flags are equal
unsafe { mem::transmute(mask as u8) } unsafe { mem::transmute(mask as u8) }
} }
#[inline]
fn map_blend_factor(factor: VkBlendFactor) -> pso::Factor { fn map_blend_factor(factor: VkBlendFactor) -> pso::Factor {
use hal::pso::Factor::*; // Vulkan and HAL values are equal
use super::VkBlendFactor::*; unsafe { mem::transmute(factor as u8) }
match factor {
VK_BLEND_FACTOR_ZERO => Zero,
VK_BLEND_FACTOR_ONE => One,
VK_BLEND_FACTOR_SRC_COLOR => SrcColor,
VK_BLEND_FACTOR_ONE_MINUS_SRC_COLOR => OneMinusSrcColor,
VK_BLEND_FACTOR_DST_COLOR => DstColor,
VK_BLEND_FACTOR_ONE_MINUS_DST_COLOR => OneMinusDstColor,
VK_BLEND_FACTOR_SRC_ALPHA => SrcAlpha,
VK_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA => OneMinusSrcAlpha,
VK_BLEND_FACTOR_DST_ALPHA => DstAlpha,
VK_BLEND_FACTOR_ONE_MINUS_DST_ALPHA => OneMinusDstAlpha,
VK_BLEND_FACTOR_CONSTANT_COLOR => ConstColor,
VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR => OneMinusConstColor,
VK_BLEND_FACTOR_CONSTANT_ALPHA => ConstAlpha,
VK_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA => OneMinusConstAlpha,
VK_BLEND_FACTOR_SRC_ALPHA_SATURATE => SrcAlphaSaturate,
VK_BLEND_FACTOR_SRC1_COLOR => Src1Color,
VK_BLEND_FACTOR_ONE_MINUS_SRC1_COLOR => OneMinusSrc1Color,
VK_BLEND_FACTOR_SRC1_ALPHA => Src1Alpha,
VK_BLEND_FACTOR_ONE_MINUS_SRC1_ALPHA => OneMinusSrc1Alpha,
_ => panic!("Unexpected blend factor: {:?}", factor),
}
} }
pub fn map_blend_op( pub fn map_blend_op(
@ -736,11 +711,13 @@ pub fn map_index_type(ty: VkIndexType) -> IndexType {
} }
} }
#[inline]
pub fn map_query_control(flags: VkQueryControlFlags) -> query::QueryControl { pub fn map_query_control(flags: VkQueryControlFlags) -> query::QueryControl {
// Vulkan and HAL flags are equal // Vulkan and HAL flags are equal
unsafe { mem::transmute(flags) } unsafe { mem::transmute(flags) }
} }
#[inline]
pub fn map_pipeline_statistics(flags: VkQueryPipelineStatisticFlags) -> query::PipelineStatistic { pub fn map_pipeline_statistics(flags: VkQueryPipelineStatisticFlags) -> query::PipelineStatistic {
// Vulkan and HAL flags are equal // Vulkan and HAL flags are equal
unsafe { mem::transmute(flags) } unsafe { mem::transmute(flags) }