griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Jeroen Bakker
2025-06-20 09:51:44 +02:00
parent 5ad4f7274a d2e88494e1
commit cdf538e1a7
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,14 +51,6 @@ VKTexture::~VKTexture()
}
}
void VKTexture::init(VkImage vk_image, VkImageLayout layout, eGPUTextureFormat texture_format)
{
vk_image_ = vk_image;
current_layout_ = layout;
format_ = texture_format;
device_format_ = texture_format;
}
void VKTexture::generate_mipmap()
{
BLI_assert(!is_texture_view());

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

@@ -60,12 +60,6 @@ class VKTexture : public Texture {
*/
Vector<VKImageView> image_views_;
/* Last image layout of the texture. Frame-buffer and barriers can alter/require the actual
* layout to be changed. During this it requires to set the current layout in order to know which
* conversion should happen. #current_layout_ keep track of the layout so the correct conversion
* can be done. */
VkImageLayout current_layout_ = VK_IMAGE_LAYOUT_UNDEFINED;
int layer_offset_ = 0;
bool use_stencil_ = false;
@@ -83,8 +77,6 @@ class VKTexture : public Texture {
virtual ~VKTexture() override;
void init(VkImage vk_image, VkImageLayout layout, eGPUTextureFormat texture_format);
void generate_mipmap() override;
void copy_to(Texture *tex) override;
void copy_to(VKTexture &dst_texture, VkImageAspectFlags vk_image_aspect);