OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vk/pipeline: Be more sloppy about shader entrypoint names

Browse Source 
The CTS passes in NULL names right now.  It's not too hard to support that
as just "main".  With this, and a patch to vulkancts, we now pass all 6
tests.
This commit is contained in:
Jason Ekstrand
2015-07-22 15:26:53 -07:00
parent 2c2233e328
commit c9dc1f4098
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vulkan/anv_pipeline.c
View File

@@ -79,9 +79,10 @@ VkResult anv_CreateShader(
assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_SHADER_CREATE_INFO); assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_SHADER_CREATE_INFO);
assert(pCreateInfo->flags == 0); assert(pCreateInfo->flags == 0);
size_t name_len = strlen(pCreateInfo->pName); const char *name = pCreateInfo->pName ? pCreateInfo->pName : "main";
size_t name_len = strlen(name);
if (strcmp(pCreateInfo->pName, "main") != 0) { if (strcmp(name, "main") != 0) {
anv_finishme("Multiple shaders per module not really supported"); anv_finishme("Multiple shaders per module not really supported");
} }
@@ -91,7 +92,7 @@ VkResult anv_CreateShader(
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
shader->module = module; shader->module = module;
memcpy(shader->entrypoint, pCreateInfo->pName, name_len + 1); memcpy(shader->entrypoint, name, name_len + 1);
*pShader = anv_shader_to_handle(shader); *pShader = anv_shader_to_handle(shader);