c/render: Rename scratch to mock

Can't use default as it's a keyword in C.
This commit is contained in:
Jakob Bornecrantz 2022-08-25 12:57:03 +01:00
parent eec55c5102
commit 4505bf09ff
3 changed files with 24 additions and 20 deletions

View file

@ -644,7 +644,7 @@ render_compute_clear(struct render_compute *crc, //
VkSampler sampler = r->compute.default_sampler;
VkSampler src_samplers[2] = {sampler, sampler};
VkImageView src_image_views[2] = {r->scratch.color.image_view, r->scratch.color.image_view};
VkImageView src_image_views[2] = {r->mock.color.image_view, r->mock.color.image_view};
VkSampler distortion_samplers[6] = {sampler, sampler, sampler, sampler, sampler, sampler};
update_compute_distortion_descriptor_set( //

View file

@ -257,6 +257,10 @@ struct render_resources
struct render_buffer ubos[2];
} mesh;
/*!
* Used as a default image empty image when none is given or to pad
* out fixed sized descriptor sets.
*/
struct
{
struct
@ -265,7 +269,7 @@ struct render_resources
VkImageView image_view;
VkDeviceMemory memory;
} color;
} scratch;
} mock;
struct
{

View file

@ -590,7 +590,7 @@ render_resources_init(struct render_resources *r,
/*
* Simulated
* Mock, used as a default image empty image.
*/
{
@ -606,21 +606,21 @@ render_resources_init(struct render_resources *r,
.layerCount = 1,
};
C(vk_create_image_simple( //
vk, // vk_bundle
extent, // extent
format, // format
usage, // usage
&r->scratch.color.memory, // out_mem
&r->scratch.color.image)); // out_image
C(vk_create_image_simple( //
vk, // vk_bundle
extent, // extent
format, // format
usage, // usage
&r->mock.color.memory, // out_mem
&r->mock.color.image)); // out_image
C(vk_create_view( //
vk, // vk_bundle
r->scratch.color.image, // image
VK_IMAGE_VIEW_TYPE_2D, // type
format, // format
subresource_range, // subresource_range
&r->scratch.color.image_view)); // out_view
C(vk_create_view( //
vk, // vk_bundle
r->mock.color.image, // image
VK_IMAGE_VIEW_TYPE_2D, // type
format, // format
subresource_range, // subresource_range
&r->mock.color.image_view)); // out_view
}
@ -934,9 +934,9 @@ render_resources_close(struct render_resources *r)
struct vk_bundle *vk = r->vk;
D(ImageView, r->scratch.color.image_view);
D(Image, r->scratch.color.image);
DF(Memory, r->scratch.color.memory);
D(ImageView, r->mock.color.image_view);
D(Image, r->mock.color.image);
DF(Memory, r->mock.color.memory);
D(DescriptorSetLayout, r->mesh.descriptor_set_layout);
D(PipelineLayout, r->mesh.pipeline_layout);
D(PipelineCache, r->pipeline_cache);