blender
/
blender
133
398
Fork 579
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

WIP: Vulkan: Workbench #107886

Closed
Jeroen Bakker wants to merge 88 commits from Jeroen-Bakker:vulkan-draw-manager-workbench into main
pull from: Jeroen-Bakker:vulkan-draw-manager-workbench
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 88 Files Changed 20 +9
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e17eed22aa - Show all commits

6
source/blender/draw/intern/draw_curves.cc
View File

@ -320,10 +320,16 @@ DRWShadingGroup *DRW_shgroup_curves_create_sub(Object *object,
/* Fix issue with certain driver not drawing anything if there is no texture bound to
* "ac", "au", "u" or "c". */
DRW_shgroup_buffer_texture(shgrp, "u", g_dummy_vbo);
DRW_shgroup_buffer_texture(shgrp, "au", g_dummy_vbo);
DRW_shgroup_buffer_texture(shgrp, "c", g_dummy_vbo);
DRW_shgroup_buffer_texture(shgrp, "ac", g_dummy_vbo);
/*
DRW_shgroup_uniform_texture(shgrp, "u", g_dummy_texture);
DRW_shgroup_uniform_texture(shgrp, "au", g_dummy_texture);
DRW_shgroup_uniform_texture(shgrp, "c", g_dummy_texture);
DRW_shgroup_uniform_texture(shgrp, "ac", g_dummy_texture);
*/
/* TODO: Generalize radius implementation for curves data type. */
float hair_rad_shape = 0.0f;

3
source/blender/gpu/vulkan/vk_backend.cc
View File

@ -159,6 +159,9 @@ void VKBackend::capabilities_init()
GCaps.compute_shader_support = true;
GCaps.shader_storage_buffer_objects_support = true;
GCaps.shader_image_load_store_support = true;
/* Although not used or implemented, it is required to make sure that curve/hair drawing uses the
* right branch. This should be fixed in the draw manager. */
GCaps.transform_feedback_support = true;
Jeroen-Bakker marked this conversation as resolved Outdated
Jeroen Bakker commented 2023-05-23 09:33:47 +02:00
Outdated
Review
Copy Link

Can be reverted

Can be reverted
GCaps.max_texture_size = max_ii(limits.maxImageDimension1D, limits.maxImageDimension2D);
GCaps.max_texture_3d_size = limits.maxImageDimension3D;