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

turnip: fix the type of tu_shader_module code field, delete unused sha1 

Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6664>
This commit is contained in:
Jonathan Marek 2020-09-09 09:49:22 -04:00 committed by Marge Bot
parent 6f51192169
commit 3b144d5fb8
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/freedreno/vulkan/tu_private.h
View File

@ -1058,10 +1058,8 @@ struct tu_shader_module
{
struct vk_object_base base;
unsigned char sha1[20];
uint32_t code_size;
const uint32_t *code[0];
uint32_t code[];
};
struct tu_push_constant_range

4
src/freedreno/vulkan/tu_shader.c
View File

@ -684,7 +684,7 @@ tu_shader_create(struct tu_device *dev,
tu_shader_module_from_handle(stage_info->module);
assert(module->code_size % 4 == 0);
nir = tu_spirv_to_nir(
dev->compiler, (const uint32_t *) module->code, module->code_size / 4,
dev->compiler, module->code, module->code_size / 4,
stage, stage_info->pName, stage_info->pSpecializationInfo);
} else {
assert(stage == MESA_SHADER_FRAGMENT);
@ -845,8 +845,6 @@ tu_CreateShaderModule(VkDevice _device,
module->code_size = pCreateInfo->codeSize;
memcpy(module->code, pCreateInfo->pCode, pCreateInfo->codeSize);
_mesa_sha1_compute(module->code, module->code_size, module->sha1);
*pShaderModule = tu_shader_module_to_handle(module);
return VK_SUCCESS;