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

radv: upload shader binaries after they are all compiled

Browse Source 
Instead of mixing compilation and upload. This will allow us to
upload all shader binaries contiguously in memory and also for future
pipeline libraries work.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13690>
This commit is contained in:
Samuel Pitoiset
2021-11-05 13:30:28 +01:00
committed by Marge Bot
parent ff61b36ba2
commit 13143b3c11
4 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/amd/vulkan/radv_pipeline.c
View File

@@ -3691,6 +3691,21 @@ radv_create_shaders(struct radv_pipeline *pipeline, struct radv_pipeline_layout
}
}
/* Upload shader binaries. */
for (int i = 0; i < MESA_VULKAN_SHADER_STAGES; ++i) {
struct radv_shader *shader = pipeline->shaders[i];
if (!shader)
continue;
if (!radv_shader_binary_upload(device, binaries[i], shader))
return VK_ERROR_OUT_OF_DEVICE_MEMORY;
if (i == MESA_SHADER_GEOMETRY && pipeline->gs_copy_shader) {
if (!radv_shader_binary_upload(device, gs_copy_binary, pipeline->gs_copy_shader))
return VK_ERROR_OUT_OF_DEVICE_MEMORY;
}
}
if (!keep_executable_info) {
if (pipeline->gs_copy_shader) {
assert(!binaries[MESA_SHADER_COMPUTE] && !pipeline->shaders[MESA_SHADER_COMPUTE]);