zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gpu: correct RenderPipelineDescriptor stack conversions

Browse source 
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst 2022-03-11 19:29:39 -07:00 • committed by Stephen Gutekanst
parent 1fafce595a
commit 36afd39945
1 changed files with 34 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

60
gpu/src/NativeInstance.zig
View file

@ -380,13 +380,43 @@ const device_vtable = Device.VTable{
}).destroy, }).destroy,
.createRenderPipeline = (struct { .createRenderPipeline = (struct {
pub fn createRenderPipeline(ptr: *anyopaque, descriptor: *const RenderPipeline.Descriptor) RenderPipeline { pub fn createRenderPipeline(ptr: *anyopaque, descriptor: *const RenderPipeline.Descriptor) RenderPipeline {
const desc = convertRenderPipelineDescriptor(descriptor); var tmp_depth_stencil: c.WGPUDepthStencilState = undefined;
var tmp_fragment_state: c.WGPUFragmentState = undefined;
const desc = convertRenderPipelineDescriptor(descriptor, &tmp_depth_stencil, &tmp_fragment_state);
return wrapRenderPipeline(c.wgpuDeviceCreateRenderPipeline(@ptrCast(c.WGPUDevice, ptr), &desc)); return wrapRenderPipeline(c.wgpuDeviceCreateRenderPipeline(@ptrCast(c.WGPUDevice, ptr), &desc));
} }
}).createRenderPipeline, }).createRenderPipeline,
}; };
inline fn convertRenderPipelineDescriptor(d: *const RenderPipeline.Descriptor) c.WGPURenderPipelineDescriptor { inline fn convertRenderPipelineDescriptor(
d: *const RenderPipeline.Descriptor,
tmp_depth_stencil: *c.WGPUDepthStencilState,
tmp_fragment_state: *c.WGPUFragmentState,
) c.WGPURenderPipelineDescriptor {
tmp_depth_stencil.* = c.WGPUDepthStencilState{
.nextInChain = null,
.format = @enumToInt(d.depth_stencil.format),
.depthWriteEnabled = d.depth_stencil.depth_write_enabled,
.depthCompare = @enumToInt(d.depth_stencil.depth_compare),
.stencilFront = @bitCast(c.WGPUStencilFaceState, d.depth_stencil.stencil_front),
.stencilBack = @bitCast(c.WGPUStencilFaceState, d.depth_stencil.stencil_back),
.stencilReadMask = d.depth_stencil.stencil_read_mask,
.stencilWriteMask = d.depth_stencil.stencil_write_mask,
.depthBias = d.depth_stencil.depth_bias,
.depthBiasSlopeScale = d.depth_stencil.depth_bias_slope_scale,
.depthBiasClamp = d.depth_stencil.depth_bias_clamp,
};
tmp_fragment_state.* = c.WGPUFragmentState{
.nextInChain = null,
.module = @ptrCast(c.WGPUShaderModule, d.fragment.module.ptr),
.entryPoint = d.vertex.entry_point,
.constantCount = 0, // d.fragment.constants.len,
.constants = null, // TODO: need to convert entire list to WGPUConstantEntry
.targetCount = 0, // d.fragment.targets.len,
.targets = null, // TODO: need to convert entire list to WGPUColorTargetState
};
return c.WGPURenderPipelineDescriptor{ return c.WGPURenderPipelineDescriptor{
.nextInChain = null, .nextInChain = null,
.label = d.label, .label = d.label,
@ -407,36 +437,14 @@ inline fn convertRenderPipelineDescriptor(d: *const RenderPipeline.Descriptor) c
.frontFace = @enumToInt(d.primitive.front_face), .frontFace = @enumToInt(d.primitive.front_face),
.cullMode = @enumToInt(d.primitive.cull_mode), .cullMode = @enumToInt(d.primitive.cull_mode),
}, },
// TODO: don't create ptr on stack or something .depthStencil = tmp_depth_stencil,
.depthStencil = &c.WGPUDepthStencilState{
.nextInChain = null,
.format = @enumToInt(d.depth_stencil.format),
.depthWriteEnabled = d.depth_stencil.depth_write_enabled,
.depthCompare = @enumToInt(d.depth_stencil.depth_compare),
.stencilFront = @bitCast(c.WGPUStencilFaceState, d.depth_stencil.stencil_front),
.stencilBack = @bitCast(c.WGPUStencilFaceState, d.depth_stencil.stencil_back),
.stencilReadMask = d.depth_stencil.stencil_read_mask,
.stencilWriteMask = d.depth_stencil.stencil_write_mask,
.depthBias = d.depth_stencil.depth_bias,
.depthBiasSlopeScale = d.depth_stencil.depth_bias_slope_scale,
.depthBiasClamp = d.depth_stencil.depth_bias_clamp,
},
.multisample = c.WGPUMultisampleState{ .multisample = c.WGPUMultisampleState{
.nextInChain = null, .nextInChain = null,
.count = d.multisample.count, .count = d.multisample.count,
.mask = d.multisample.mask, .mask = d.multisample.mask,
.alphaToCoverageEnabled = d.multisample.alpha_to_coverage_enabled, .alphaToCoverageEnabled = d.multisample.alpha_to_coverage_enabled,
}, },
// TODO: don't create ptr on stack or something .fragment = tmp_fragment_state,
.fragment = &c.WGPUFragmentState{
.nextInChain = null,
.module = @ptrCast(c.WGPUShaderModule, d.fragment.module.ptr),
.entryPoint = d.vertex.entry_point,
.constantCount = 0, // d.fragment.constants.len,
.constants = null, // TODO: need to convert entire list to WGPUConstantEntry
.targetCount = 0, // d.fragment.targets.len,
.targets = null, // TODO: need to convert entire list to WGPUColorTargetState
},
}; };
} }