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

nvk: Ensure we have nvkmd before shader upload

Browse Source 
This is to allow us later to create a VkDevice without having to touch the
kernel for VkDevice objects without VkQueues used for things like shader
compilation.

Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35804>
This commit is contained in:
Mohamed Ahmed
2025-07-02 19:58:59 +03:00
committed by Marge Bot
parent 49db51e5ff
commit 5945d42d3b
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nouveau/vulkan/nvk_shader.c
+14 -10
View File
@@ -909,10 +909,12 @@ nvk_compile_shader(struct nvk_device *dev,
return result;
}
result = nvk_shader_upload(dev, shader);
if (result != VK_SUCCESS) {
nvk_shader_destroy(&dev->vk, &shader->vk, pAllocator);
return result;
if (dev->nvkmd) {
result = nvk_shader_upload(dev, shader);
if (result != VK_SUCCESS) {
nvk_shader_destroy(&dev->vk, &shader->vk, pAllocator);
return result;
}
}
if (info->stage == MESA_SHADER_FRAGMENT) {
@@ -923,7 +925,7 @@ nvk_compile_shader(struct nvk_device *dev,
}
}
if (info->stage != MESA_SHADER_COMPUTE) {
if (info->stage != MESA_SHADER_COMPUTE && dev->nvkmd) {
result = nvk_shader_fill_push(dev, shader, pAllocator);
if (result != VK_SUCCESS) {
nvk_shader_destroy(&dev->vk, &shader->vk, pAllocator);
@@ -1062,13 +1064,15 @@ nvk_deserialize_shader(struct vk_device *vk_dev,
return vk_error(dev, VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT);
}
result = nvk_shader_upload(dev, shader);
if (result != VK_SUCCESS) {
nvk_shader_destroy(&dev->vk, &shader->vk, pAllocator);
return result;
if (dev->nvkmd) {
result = nvk_shader_upload(dev, shader);
if (result != VK_SUCCESS) {
nvk_shader_destroy(&dev->vk, &shader->vk, pAllocator);
return result;
}
}
if (info.stage != MESA_SHADER_COMPUTE) {
if (info.stage != MESA_SHADER_COMPUTE && dev->nvkmd) {
result = nvk_shader_fill_push(dev, shader, pAllocator);
if (result != VK_SUCCESS) {
nvk_shader_destroy(&dev->vk, &shader->vk, pAllocator);