blender
/
blender
133
398
Fork 578
Code Issues 6.3k Pull Requests 746 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 +5 -6
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a34dd7e56b - Show all commits

1
source/blender/gpu/vulkan/vk_pipeline_state.cc
View File

@ -16,7 +16,6 @@ VKPipelineStateManager::VKPipelineStateManager()
rasterization_state = {};
rasterization_state.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
rasterization_state.lineWidth = 1.0f;
rasterization_state.depthClampEnable = VK_FALSE;
pipeline_color_blend_state = {};
pipeline_color_blend_state.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO;

4
source/blender/gpu/vulkan/vk_texture.cc
View File

@ -518,10 +518,10 @@ void VKTexture::layout_ensure(VKContext &context,
/** \} */
/* -------------------------------------------------------------------- */
/** \name Mipmapping
/** \name Image Views
* \{ */
void VKTexture::vk_image_view_ensure()
void VKTexture::image_view_ensure()
{
if (flags_ & IMAGE_VIEW_DIRTY) {
image_view_update();

6
source/blender/gpu/vulkan/vk_texture.hh
View File

@ -128,18 +128,18 @@ class VKTexture : public Texture {
/** \} */
/* -------------------------------------------------------------------- */
/** \name Mipmapping
/** \name Image Views
* \{ */
public:
VKImageView &image_view_get()
{
vk_image_view_ensure();
image_view_ensure();
return *image_view_;
}
private:
IndexRange mip_map_range() const;
void vk_image_view_ensure();
void image_view_ensure();
void image_view_update();
/** \} */