alex/ash
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge #191

Browse source 
191: Pass constant size arrays by reference r=MaikKlein a=kvark

Note: this is a breaking change!
Some related reading: https://lkml.org/lkml/2015/9/3/428
This has been plaguing WebRender on gfx-rs port running Windows/Vulkan.

Co-authored-by: Dzmitry Malyshau <dmalyshau@mozilla.com>
This commit is contained in:
bors[bot] 2019-03-08 08:43:30 +00:00
parent c801dea0dc 7aa30a6544
commit 51d693bfb9
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ash/src/device.rs
View file

@ -1132,7 +1132,7 @@ pub trait DeviceV1_0 {
unsafe fn cmd_set_blend_constants( unsafe fn cmd_set_blend_constants(
&self, &self,
command_buffer: vk::CommandBuffer, command_buffer: vk::CommandBuffer,
blend_constants: [f32; 4], blend_constants: &[f32; 4],
) { ) {
self.fp_v1_0() self.fp_v1_0()
.cmd_set_blend_constants(command_buffer, blend_constants); .cmd_set_blend_constants(command_buffer, blend_constants);

6
ash/src/vk.rs
View file

@ -2190,7 +2190,7 @@ pub struct DeviceFnV1_0 {
depth_bias_slope_factor: f32, depth_bias_slope_factor: f32,
) -> c_void, ) -> c_void,
pub cmd_set_blend_constants: pub cmd_set_blend_constants:
extern "system" fn(command_buffer: CommandBuffer, blend_constants: [f32; 4]) -> c_void, extern "system" fn(command_buffer: CommandBuffer, blend_constants: &[f32; 4]) -> c_void,
pub cmd_set_depth_bounds: extern "system" fn( pub cmd_set_depth_bounds: extern "system" fn(
command_buffer: CommandBuffer, command_buffer: CommandBuffer,
min_depth_bounds: f32, min_depth_bounds: f32,
@ -4058,7 +4058,7 @@ impl DeviceFnV1_0 {
cmd_set_blend_constants: unsafe { cmd_set_blend_constants: unsafe {
extern "system" fn cmd_set_blend_constants( extern "system" fn cmd_set_blend_constants(
_command_buffer: CommandBuffer, _command_buffer: CommandBuffer,
_blend_constants: [f32; 4], _blend_constants: &[f32; 4],
) -> c_void { ) -> c_void {
panic!(concat!( panic!(concat!(
"Unable to load ", "Unable to load ",
@ -5545,7 +5545,7 @@ impl DeviceFnV1_0 {
pub unsafe fn cmd_set_blend_constants( pub unsafe fn cmd_set_blend_constants(
&self, &self,
command_buffer: CommandBuffer, command_buffer: CommandBuffer,
blend_constants: [f32; 4], blend_constants: &[f32; 4],
) -> c_void { ) -> c_void {
(self.cmd_set_blend_constants)(command_buffer, blend_constants) (self.cmd_set_blend_constants)(command_buffer, blend_constants)
} }

2
generator/src/lib.rs
View file

@ -663,7 +663,7 @@ impl FieldExt for vkxml::Field {
let size = constant_name(size); let size = constant_name(size);
let size = Term::intern(&size); let size = Term::intern(&size);
Some(quote! { Some(quote! {
[#ty; #size] &[#ty; #size]
}) })
} }
_ => None, _ => None,