File tree Expand file tree Collapse file tree 3 files changed +8
-6
lines changed
backends/vulkan/runtime/vk_api/memory Expand file tree Collapse file tree 3 files changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -134,8 +134,8 @@ VulkanImage Allocator::create_image(
134
134
image_props,
135
135
view_props,
136
136
sampler_props,
137
- initial_layout,
138
137
sampler,
138
+ initial_layout,
139
139
allocate_memory);
140
140
}
141
141
Original file line number Diff line number Diff line change @@ -115,8 +115,8 @@ VulkanImage::VulkanImage(
115
115
const ImageProperties& image_props,
116
116
const ViewProperties& view_props,
117
117
const SamplerProperties& sampler_props,
118
- const VkImageLayout layout,
119
118
VkSampler sampler,
119
+ const VkImageLayout layout,
120
120
const bool allocate_memory)
121
121
: device_{device},
122
122
image_properties_ (image_props),
@@ -186,7 +186,8 @@ VulkanImage::VulkanImage(
186
186
const ImageProperties& image_props,
187
187
VkImage image,
188
188
VkImageView image_view,
189
- VkSampler sampler)
189
+ VkSampler sampler,
190
+ const VkImageLayout layout)
190
191
: device_{device},
191
192
image_properties_{image_props},
192
193
view_properties_{},
@@ -200,7 +201,7 @@ VulkanImage::VulkanImage(
200
201
image_view,
201
202
sampler,
202
203
},
203
- layout_{VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL } {}
204
+ layout_{layout } {}
204
205
205
206
VulkanImage::VulkanImage (const VulkanImage& other) noexcept
206
207
: device_(other.device_),
Original file line number Diff line number Diff line change @@ -99,16 +99,17 @@ class VulkanImage final {
99
99
const ImageProperties&,
100
100
const ViewProperties&,
101
101
const SamplerProperties&,
102
- const VkImageLayout layout,
103
102
VkSampler,
103
+ const VkImageLayout,
104
104
const bool allocate_memory = true );
105
105
106
106
explicit VulkanImage (
107
107
VkDevice,
108
108
const ImageProperties&,
109
109
VkImage,
110
110
VkImageView,
111
- VkSampler);
111
+ VkSampler,
112
+ const VkImageLayout);
112
113
113
114
protected:
114
115
/*
You can’t perform that action at this time.
0 commit comments