AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: pass screen to zink_create_gfx_pipeline

Browse Source 
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Erik Faye-Lund
2019-09-23 22:11:35 +02:00
parent 5cf93985a0
commit 59f8ba05f5
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_pipeline.c
+4 -2
View File
@@ -34,7 +34,8 @@
#include "util/u_prim.h"
VkPipeline
zink_create_gfx_pipeline(VkDevice dev, struct zink_gfx_program *prog,
zink_create_gfx_pipeline(struct zink_screen *screen,
struct zink_gfx_program *prog,
struct zink_gfx_pipeline_state *state,
VkPrimitiveTopology primitive_topology)
{
@@ -144,7 +145,8 @@ zink_create_gfx_pipeline(VkDevice dev, struct zink_gfx_program *prog,
pci.stageCount = num_stages;
VkPipeline pipeline;
if (vkCreateGraphicsPipelines(dev, VK_NULL_HANDLE, 1, &pci, NULL, &pipeline) != VK_SUCCESS) {
if (vkCreateGraphicsPipelines(screen->dev, VK_NULL_HANDLE, 1, &pci,
NULL, &pipeline) != VK_SUCCESS) {
debug_printf("vkCreateGraphicsPipelines failed\n");
return VK_NULL_HANDLE;
}
src/gallium/drivers/zink/zink_pipeline.h
+3 -1
View File
@@ -33,6 +33,7 @@ struct zink_depth_stencil_alpha_state;
struct zink_gfx_program;
struct zink_rasterizer_state;
struct zink_render_pass;
struct zink_screen;
struct zink_vertex_elements_state;
struct zink_gfx_pipeline_state {
@@ -55,7 +56,8 @@ struct zink_gfx_pipeline_state {
};
VkPipeline
zink_create_gfx_pipeline(VkDevice dev, struct zink_gfx_program *prog,
zink_create_gfx_pipeline(struct zink_screen *screen,
struct zink_gfx_program *prog,
struct zink_gfx_pipeline_state *state,
VkPrimitiveTopology primitive_topology);
src/gallium/drivers/zink/zink_program.c
+1 -1
View File
@@ -229,7 +229,7 @@ zink_get_gfx_pipeline(struct zink_screen *screen,
struct hash_entry *entry = _mesa_hash_table_search(prog->pipelines[mode], state);
if (!entry) {
VkPrimitiveTopology vkmode = primitive_topology(mode);
VkPipeline pipeline = zink_create_gfx_pipeline(screen->dev, prog,
VkPipeline pipeline = zink_create_gfx_pipeline(screen, prog,
state, vkmode);
if (pipeline == VK_NULL_HANDLE)
return VK_NULL_HANDLE;