diff options
| author | Erik Faye-Lund <[email protected]> | 2019-03-25 15:59:25 +0100 |
|---|---|---|
| committer | Erik Faye-Lund <[email protected]> | 2019-10-28 08:51:44 +0000 |
| commit | fba0293bef4ee25dd16eb099a71ef346e717ca4e (patch) | |
| tree | 1f45b9092745898c17a29bf7b6e34419c188c851 /src/gallium | |
| parent | 86d0e741ec977193974c29c44cbf85699fedcf5a (diff) | |
zink: pass zink_render_pass to pipeline-creation
Acked-by: Jordan Justen <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/zink/zink_context.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_pipeline.c | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_pipeline.h | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 4b31557cda9..de77575ac9f 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -798,7 +798,7 @@ zink_draw_vbo(struct pipe_context *pctx, VkPipeline pipeline = zink_create_gfx_pipeline(screen->dev, gfx_program, &ctx->gfx_pipeline_state, - ctx->render_pass->render_pass); + ctx->render_pass); bool depth_bias = false; switch (u_reduced_prim(dinfo->mode)) { diff --git a/src/gallium/drivers/zink/zink_pipeline.c b/src/gallium/drivers/zink/zink_pipeline.c index 4e517d8a496..f43af2d581a 100644 --- a/src/gallium/drivers/zink/zink_pipeline.c +++ b/src/gallium/drivers/zink/zink_pipeline.c @@ -26,6 +26,7 @@ #include "zink_compiler.h" #include "zink_context.h" #include "zink_program.h" +#include "zink_render_pass.h" #include "zink_screen.h" #include "zink_state.h" @@ -35,7 +36,7 @@ VkPipeline zink_create_gfx_pipeline(VkDevice dev, struct zink_gfx_program *prog, struct zink_gfx_pipeline_state *state, - VkRenderPass render_pass) + struct zink_render_pass *rp) { VkPipelineVertexInputStateCreateInfo vertex_input_state = {}; vertex_input_state.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO; @@ -113,7 +114,7 @@ zink_create_gfx_pipeline(VkDevice dev, struct zink_gfx_program *prog, pci.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO; pci.flags = VK_PIPELINE_CREATE_DISABLE_OPTIMIZATION_BIT; pci.layout = prog->layout; - pci.renderPass = render_pass; + pci.renderPass = rp->render_pass; pci.pVertexInputState = &vertex_input_state; pci.pInputAssemblyState = &primitive_state; pci.pRasterizationState = &rast_state; diff --git a/src/gallium/drivers/zink/zink_pipeline.h b/src/gallium/drivers/zink/zink_pipeline.h index ecc2c184283..8c0300eebb2 100644 --- a/src/gallium/drivers/zink/zink_pipeline.h +++ b/src/gallium/drivers/zink/zink_pipeline.h @@ -32,7 +32,7 @@ struct zink_blend_state; struct zink_depth_stencil_alpha_state; struct zink_gfx_program; struct zink_rasterizer_state; -struct zink_shader; +struct zink_render_pass; struct zink_vertex_elements_state; struct zink_gfx_pipeline_state { @@ -54,6 +54,6 @@ struct zink_gfx_pipeline_state { VkPipeline zink_create_gfx_pipeline(VkDevice dev, struct zink_gfx_program *prog, struct zink_gfx_pipeline_state *state, - VkRenderPass render_pass); + struct zink_render_pass *rp); #endif |