From 25cb2e179017ee05df121cca4d91b28c7f60d878 Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Tue, 17 May 2022 15:26:50 -0500
Subject: [PATCH] c/render: Improve word choice/clarity

---
 src/xrt/compositor/render/render_compute.c   |  2 +-
 src/xrt/compositor/render/render_interface.h |  4 +--
 src/xrt/compositor/render/render_resources.c | 34 ++++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/xrt/compositor/render/render_compute.c b/src/xrt/compositor/render/render_compute.c
index 597b2097a..940d5c6f4 100644
--- a/src/xrt/compositor/render/render_compute.c
+++ b/src/xrt/compositor/render/render_compute.c
@@ -649,7 +649,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->dummy.color.image_view, r->dummy.color.image_view};
+	VkImageView src_image_views[2] = {r->scratch.color.image_view, r->scratch.color.image_view};
 	VkSampler distortion_samplers[6] = {sampler, sampler, sampler, sampler, sampler, sampler};
 
 	update_compute_discriptor_set(     //
diff --git a/src/xrt/compositor/render/render_interface.h b/src/xrt/compositor/render/render_interface.h
index 4a9121fbd..8a73c49db 100644
--- a/src/xrt/compositor/render/render_interface.h
+++ b/src/xrt/compositor/render/render_interface.h
@@ -257,7 +257,7 @@ struct render_resources
 			VkImageView image_view;
 			VkDeviceMemory memory;
 		} color;
-	} dummy;
+	} scratch;
 
 	struct
 	{
@@ -276,7 +276,7 @@ struct render_resources
 		//! Uniform data binding.
 		uint32_t ubo_binding;
 
-		//! Dummy sampler for null images.
+		//! Default sampler for null images.
 		VkSampler default_sampler;
 
 		//! Descriptor set layout for compute distortion.
diff --git a/src/xrt/compositor/render/render_resources.c b/src/xrt/compositor/render/render_resources.c
index d1991da4c..58974f2df 100644
--- a/src/xrt/compositor/render/render_resources.c
+++ b/src/xrt/compositor/render/render_resources.c
@@ -568,7 +568,7 @@ render_resources_init(struct render_resources *r,
 
 
 	/*
-	 * Dummy
+	 * Simulated
 	 */
 
 	{
@@ -584,20 +584,20 @@ render_resources_init(struct render_resources *r,
 		    .layerCount = 1,
 		};
 
-		C(vk_create_image_simple(    //
-		    vk,                      // vk_bundle
-		    extent,                  // extent
-		    format,                  // format
-		    usage,                   // usage
-		    &r->dummy.color.memory,  // out_mem
-		    &r->dummy.color.image)); // out_image
+		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_view(                 //
-		    vk,                           // vk_bundle
-		    r->dummy.color.image,         // image
-		    format,                       // format
-		    subresource_range,            // subresource_range
-		    &r->dummy.color.image_view)); // out_view
+		C(vk_create_view(                   //
+		    vk,                             // vk_bundle
+		    r->scratch.color.image,         // image
+		    format,                         // format
+		    subresource_range,              // subresource_range
+		    &r->scratch.color.image_view)); // out_view
 	}
 
 
@@ -814,9 +814,9 @@ render_resources_close(struct render_resources *r)
 
 	struct vk_bundle *vk = r->vk;
 
-	D(ImageView, r->dummy.color.image_view);
-	D(Image, r->dummy.color.image);
-	DF(Memory, r->dummy.color.memory);
+	D(ImageView, r->scratch.color.image_view);
+	D(Image, r->scratch.color.image);
+	DF(Memory, r->scratch.color.memory);
 	D(DescriptorSetLayout, r->mesh.descriptor_set_layout);
 	D(PipelineLayout, r->mesh.pipeline_layout);
 	D(PipelineCache, r->pipeline_cache);