[Bf-blender-cvs] [7214298cd18] temp-vulkan-shader: Merge branch 'master' into temp-vulkan-shader

[Jeroen Bakker]

Commit: 7214298cd18574ed9e36804b11eaaad97af331e7
Author: Jeroen Bakker
Date:   Fri Dec 2 08:37:58 2022 +0100
Branches: temp-vulkan-shader
https://developer.blender.org/rB7214298cd18574ed9e36804b11eaaad97af331e7

Merge branch 'master' into temp-vulkan-shader

===================================================================



===================================================================

diff --cc source/blender/gpu/CMakeLists.txt
index 6b6c88acf98,cf485bf476a..5c6db59b739
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@@ -192,11 -191,12 +192,13 @@@ set(VULKAN_SR
    vulkan/vk_batch.cc
    vulkan/vk_context.cc
    vulkan/vk_drawlist.cc
+   vulkan/vk_fence.cc
    vulkan/vk_framebuffer.cc
    vulkan/vk_index_buffer.cc
+   vulkan/vk_pixel_buffer.cc
    vulkan/vk_query.cc
    vulkan/vk_shader.cc
 +  vulkan/vk_shader_log.cc
    vulkan/vk_storage_buffer.cc
    vulkan/vk_texture.cc
    vulkan/vk_uniform_buffer.cc
@@@ -206,11 -206,12 +208,13 @@@
    vulkan/vk_batch.hh
    vulkan/vk_context.hh
    vulkan/vk_drawlist.hh
+   vulkan/vk_fence.hh
    vulkan/vk_framebuffer.hh
    vulkan/vk_index_buffer.hh
+   vulkan/vk_pixel_buffer.hh
    vulkan/vk_query.hh
    vulkan/vk_shader.hh
 +  vulkan/vk_shader_log.hh
    vulkan/vk_storage_buffer.hh
    vulkan/vk_texture.hh
    vulkan/vk_uniform_buffer.hh