@@ -11,17 +11,18 @@ void ForwardPass::setup_out_attachments(std::vector<Graphics::AttachmentConfig>&
1111
1212 attachments.resize (multisampled ? 4 : 2 );
1313
14- attachments[0 ] = Graphics::AttachmentConfig (
15- m_colorFormat,
16- samples,
17- m_isDefault ? (multisampled ? LAYOUT_COLOR_ATTACHMENT_OPTIMAL : LAYOUT_PRESENT) : LAYOUT_SHADER_READ_ONLY_OPTIMAL,
18- LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
19- !m_isDefault ? IMAGE_USAGE_COLOR_ATTACHMENT | IMAGE_USAGE_SAMPLED : IMAGE_USAGE_TRANSIENT_ATTACHMENT | IMAGE_USAGE_COLOR_ATTACHMENT,
20- COLOR_ATTACHMENT,
21- ASPECT_COLOR,
22- TEXTURE_2D,
23- FILTER_LINEAR,
24- ADDRESS_MODE_CLAMP_TO_EDGE);
14+ attachments[0 ] =
15+ Graphics::AttachmentConfig (m_colorFormat,
16+ samples,
17+ m_isDefault ? (multisampled ? LAYOUT_COLOR_ATTACHMENT_OPTIMAL : LAYOUT_PRESENT) : LAYOUT_SHADER_READ_ONLY_OPTIMAL,
18+ LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
19+ !m_isDefault ? IMAGE_USAGE_COLOR_ATTACHMENT | IMAGE_USAGE_SAMPLED | IMAGE_USAGE_TRANSFER_SRC | IMAGE_USAGE_TRANSFER_DST
20+ : IMAGE_USAGE_TRANSIENT_ATTACHMENT | IMAGE_USAGE_COLOR_ATTACHMENT,
21+ COLOR_ATTACHMENT,
22+ ASPECT_COLOR,
23+ TEXTURE_2D,
24+ FILTER_LINEAR,
25+ ADDRESS_MODE_CLAMP_TO_EDGE);
2526
2627 attachments[0 ].isDefault = m_isDefault ? (multisampled ? false : true ) : false ;
2728
@@ -41,15 +42,16 @@ void ForwardPass::setup_out_attachments(std::vector<Graphics::AttachmentConfig>&
4142 if (multisampled)
4243 {
4344 m_interAttachments.resize (2 );
44- attachments[2 ] = Graphics::AttachmentConfig (
45- m_colorFormat,
46- 1 ,
47- m_isDefault ? LAYOUT_PRESENT : LAYOUT_SHADER_READ_ONLY_OPTIMAL,
48- LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
49- !m_isDefault ? IMAGE_USAGE_COLOR_ATTACHMENT | IMAGE_USAGE_SAMPLED : IMAGE_USAGE_TRANSIENT_ATTACHMENT | IMAGE_USAGE_COLOR_ATTACHMENT,
50- RESOLVE_ATTACHMENT,
51- ASPECT_COLOR,
52- TEXTURE_2D);
45+ attachments[2 ] =
46+ Graphics::AttachmentConfig (m_colorFormat,
47+ 1 ,
48+ m_isDefault ? LAYOUT_PRESENT : LAYOUT_SHADER_READ_ONLY_OPTIMAL,
49+ LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
50+ !m_isDefault ? IMAGE_USAGE_COLOR_ATTACHMENT | IMAGE_USAGE_SAMPLED | IMAGE_USAGE_TRANSFER_SRC | IMAGE_USAGE_TRANSFER_DST
51+ : IMAGE_USAGE_TRANSIENT_ATTACHMENT | IMAGE_USAGE_COLOR_ATTACHMENT,
52+ RESOLVE_ATTACHMENT,
53+ ASPECT_COLOR,
54+ TEXTURE_2D);
5355 attachments[2 ].isDefault = m_isDefault ? true : false ;
5456
5557 attachments[3 ] = Graphics::AttachmentConfig (m_colorFormat,
@@ -141,24 +143,20 @@ void ForwardPass::setup_uniforms(std::vector<Graphics::Frame>& frames) {
141143 // m_descriptors[i].globalDescritor.update(
142144 // get_image(ResourceManager::FALLBACK_TEXTURE), LAYOUT_SHADER_READ_ONLY_OPTIMAL, 3);
143145
144- m_descriptors[i].globalDescritor .update (
145- get_image (ResourceManager::textureResources[0 ]), LAYOUT_SHADER_READ_ONLY_OPTIMAL, 6 );
146+ m_descriptors[i].globalDescritor .update (get_image (ResourceManager::textureResources[0 ]), LAYOUT_SHADER_READ_ONLY_OPTIMAL, 6 );
146147
147148 // Per-object
148149 m_descriptorPool.allocate_descriptor_set (OBJECT_LAYOUT, &m_descriptors[i].objectDescritor );
149- m_descriptors[i].objectDescritor .update (
150- &frames[i].uniformBuffers [OBJECT_LAYOUT], sizeof (ObjectUniforms), 0 ,UNIFORM_DYNAMIC_BUFFER, 0 );
150+ m_descriptors[i].objectDescritor .update (&frames[i].uniformBuffers [OBJECT_LAYOUT], sizeof (ObjectUniforms), 0 , UNIFORM_DYNAMIC_BUFFER, 0 );
151151 m_descriptors[i].objectDescritor .update (&frames[i].uniformBuffers [OBJECT_LAYOUT],
152- sizeof (MaterialUniforms),
153- m_device->pad_uniform_buffer_size (sizeof (MaterialUniforms)),
154-
155- UNIFORM_DYNAMIC_BUFFER,
156- 1 );
152+ sizeof (MaterialUniforms),
153+ m_device->pad_uniform_buffer_size (sizeof (MaterialUniforms)),
154+
155+ UNIFORM_DYNAMIC_BUFFER,
156+ 1 );
157157 // Set up enviroment fallback texture
158- m_descriptors[i].globalDescritor .update (
159- get_image (ResourceManager::FALLBACK_CUBEMAP), LAYOUT_SHADER_READ_ONLY_OPTIMAL, 3 );
160- m_descriptors[i].globalDescritor .update (
161- get_image (ResourceManager::FALLBACK_CUBEMAP), LAYOUT_SHADER_READ_ONLY_OPTIMAL, 4 );
158+ m_descriptors[i].globalDescritor .update (get_image (ResourceManager::FALLBACK_CUBEMAP), LAYOUT_SHADER_READ_ONLY_OPTIMAL, 3 );
159+ m_descriptors[i].globalDescritor .update (get_image (ResourceManager::FALLBACK_CUBEMAP), LAYOUT_SHADER_READ_ONLY_OPTIMAL, 4 );
162160 }
163161}
164162void ForwardPass::setup_shader_passes () {
0 commit comments