diff --git a/src/nouveau/vulkan/nvk_compute_pipeline.c b/src/nouveau/vulkan/nvk_compute_pipeline.c index aebce33887e..69afd42d715 100644 --- a/src/nouveau/vulkan/nvk_compute_pipeline.c +++ b/src/nouveau/vulkan/nvk_compute_pipeline.c @@ -103,7 +103,7 @@ nvk_compute_pipeline_create(struct nvk_device *device, if (result != VK_SUCCESS) goto fail; - nvk_shader_upload(pdevice, &pipeline->base.shaders[MESA_SHADER_COMPUTE]); + nvk_shader_upload(device, &pipeline->base.shaders[MESA_SHADER_COMPUTE]); gv100_compute_setup_launch_desc_template(pipeline->qmd_template, &pipeline->base.shaders[MESA_SHADER_COMPUTE]); *pPipeline = nvk_pipeline_to_handle(&pipeline->base); return VK_SUCCESS; diff --git a/src/nouveau/vulkan/nvk_shader.c b/src/nouveau/vulkan/nvk_shader.c index d9dc08f2ffa..137a2cfd3ec 100644 --- a/src/nouveau/vulkan/nvk_shader.c +++ b/src/nouveau/vulkan/nvk_shader.c @@ -197,13 +197,14 @@ nvk_compile_nir(struct nvk_physical_device *device, nir_shader *nir, } void -nvk_shader_upload(struct nvk_physical_device *physical, struct nvk_shader *shader) +nvk_shader_upload(struct nvk_device *dev, struct nvk_shader *shader) { void *ptr; /* TODO: The I-cache pre-fetches and we don't really know by how much. So * throw on a bunch just to be sure. */ - shader->bo = nouveau_ws_bo_new(physical->dev, shader->code_size + 4096, 256, + shader->bo = nouveau_ws_bo_new(nvk_device_physical(dev)->dev, + shader->code_size + 4096, 256, NOUVEAU_WS_BO_LOCAL | NOUVEAU_WS_BO_MAP); ptr = nouveau_ws_bo_map(shader->bo, NOUVEAU_WS_BO_WR); diff --git a/src/nouveau/vulkan/nvk_shader.h b/src/nouveau/vulkan/nvk_shader.h index 410d3bd977c..c1ee0d94e7f 100644 --- a/src/nouveau/vulkan/nvk_shader.h +++ b/src/nouveau/vulkan/nvk_shader.h @@ -55,5 +55,5 @@ nvk_compile_nir(struct nvk_physical_device *device, nir_shader *nir, struct nvk_shader *shader); void -nvk_shader_upload(struct nvk_physical_device *physical, struct nvk_shader *shader); +nvk_shader_upload(struct nvk_device *dev, struct nvk_shader *shader); #endif