fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-01 06:50:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: disable shaders linking with ESO when nextStage of VS/TES isn't present

Browse source 
For example, if the application wants to create linked shaders with
VS/TCS/TES but the next stage of TES isn't present, the driver would
have to compile shader variants (ie. nextStage could be NONE,TES,GS).

This isn't supported by RADV without re-compiling all shaders twice,
and it's also likely less optimal than compiling unlinked shaders.

This fixes recent CTS
dEQP-VK.shader_object.link.linked_linked_linked_unlinked_unlinked.*

Fixes: 37d7c2172b ("radv: add support for creating/destroying shader objects")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31062>
(cherry picked from commit 868272c2e9)
This commit is contained in:
Samuel Pitoiset 2024-09-06 13:35:11 +02:00 • committed by Eric Engestrom
parent 8e4b36ac9d
commit dc465140c6
2 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -3294,7 +3294,7 @@
"description": "radv: disable shaders linking with ESO when nextStage of VS/TES isn't present",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "37d7c2172b2a9dbf9b0469fdff40b33b92cc99a5",
"notes": null

47
src/amd/vulkan/radv_shader_object.c
View file

@ -565,6 +565,45 @@ radv_shader_object_create_linked(VkDevice _device, uint32_t createInfoCount, con
return VK_SUCCESS;
}
static bool
radv_shader_object_linking_enabled(uint32_t createInfoCount, const VkShaderCreateInfoEXT *pCreateInfos)
{
const bool has_linked_spirv = createInfoCount > 1 &&
!!(pCreateInfos[0].flags & VK_SHADER_CREATE_LINK_STAGE_BIT_EXT) &&
pCreateInfos[0].codeType == VK_SHADER_CODE_TYPE_SPIRV_EXT;
if (!has_linked_spirv)
return false;
/* Gather the available shader stages. */
VkShaderStageFlagBits stages = 0;
for (unsigned i = 0; i < createInfoCount; i++) {
const VkShaderCreateInfoEXT *pCreateInfo = &pCreateInfos[i];
stages |= pCreateInfo->stage;
}
for (unsigned i = 0; i < createInfoCount; i++) {
const VkShaderCreateInfoEXT *pCreateInfo = &pCreateInfos[i];
/* Force disable shaders linking when the next stage of VS/TES isn't present because the
* driver would need to compile all shaders twice due to shader variants. This is probably
* less optimal than compiling unlinked shaders.
*/
if ((pCreateInfo->stage & VK_SHADER_STAGE_VERTEX_BIT) &&
(pCreateInfo->nextStage & (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT | VK_SHADER_STAGE_GEOMETRY_BIT)) &&
!(stages & (VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT | VK_SHADER_STAGE_GEOMETRY_BIT)))
return false;
if ((pCreateInfo->stage & VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT) &&
(pCreateInfo->nextStage & VK_SHADER_STAGE_GEOMETRY_BIT) && !(stages & VK_SHADER_STAGE_GEOMETRY_BIT))
return false;
assert(pCreateInfo->flags & VK_SHADER_CREATE_LINK_STAGE_BIT_EXT);
}
return true;
}
VKAPI_ATTR VkResult VKAPI_CALL
radv_CreateShadersEXT(VkDevice _device, uint32_t createInfoCount, const VkShaderCreateInfoEXT *pCreateInfos,
const VkAllocationCallbacks *pAllocator, VkShaderEXT *pShaders)
@ -572,14 +611,8 @@ radv_CreateShadersEXT(VkDevice _device, uint32_t createInfoCount, const VkShader
VkResult result = VK_SUCCESS;
unsigned i = 0;
if (createInfoCount > 1 && !!(pCreateInfos[0].flags & VK_SHADER_CREATE_LINK_STAGE_BIT_EXT) &&
pCreateInfos[0].codeType == VK_SHADER_CODE_TYPE_SPIRV_EXT) {
for (unsigned j = 0; j < createInfoCount; j++) {
assert(pCreateInfos[i].flags & VK_SHADER_CREATE_LINK_STAGE_BIT_EXT);
}
if (radv_shader_object_linking_enabled(createInfoCount, pCreateInfos))
return radv_shader_object_create_linked(_device, createInfoCount, pCreateInfos, pAllocator, pShaders);
}
for (; i < createInfoCount; i++) {
VkResult r;