Add check to VDeleter to handle self-assignment

Overv · Overv · commit 903687e6f4d4 · 2016-10-04T14:31:43.000+02:00
diff --git a/03_Drawing_a_triangle/00_Setup/00_Base_code.md b/03_Drawing_a_triangle/00_Setup/00_Base_code.md
@@ -152,8 +152,10 @@ public:
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/base_code.cpp b/code/base_code.cpp
@@ -43,8 +43,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/command_buffers.cpp b/code/command_buffers.cpp
@@ -78,8 +78,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/depth_buffering.cpp b/code/depth_buffering.cpp
@@ -88,8 +88,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/descriptor_layout.cpp b/code/descriptor_layout.cpp
@@ -84,8 +84,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/descriptor_set.cpp b/code/descriptor_set.cpp
@@ -84,8 +84,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/fixed_functions.cpp b/code/fixed_functions.cpp
@@ -78,8 +78,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/framebuffers.cpp b/code/framebuffers.cpp
@@ -78,8 +78,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/graphics_pipeline.cpp b/code/graphics_pipeline.cpp
@@ -78,8 +78,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/graphics_pipeline_complete.cpp b/code/graphics_pipeline_complete.cpp
@@ -78,8 +78,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/hello_triangle.cpp b/code/hello_triangle.cpp
@@ -78,8 +78,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/image_views.cpp b/code/image_views.cpp
@@ -77,8 +77,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/index_buffer.cpp b/code/index_buffer.cpp
@@ -81,8 +81,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/instance_creation.cpp b/code/instance_creation.cpp
@@ -43,8 +43,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/logical_device.cpp b/code/logical_device.cpp
@@ -71,8 +71,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/model_loading.cpp b/code/model_loading.cpp
@@ -96,8 +96,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/physical_device_selection.cpp b/code/physical_device_selection.cpp
@@ -71,8 +71,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/render_passes.cpp b/code/render_passes.cpp
@@ -78,8 +78,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/sampler.cpp b/code/sampler.cpp
@@ -87,8 +87,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/shader_modules.cpp b/code/shader_modules.cpp
@@ -78,8 +78,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/staging_buffer.cpp b/code/staging_buffer.cpp
@@ -81,8 +81,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/swap_chain_creation.cpp b/code/swap_chain_creation.cpp
@@ -77,8 +77,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/swap_chain_recreation.cpp b/code/swap_chain_recreation.cpp
@@ -78,8 +78,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/texture_image.cpp b/code/texture_image.cpp
@@ -87,8 +87,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/texture_mapping.cpp b/code/texture_mapping.cpp
@@ -87,8 +87,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/validation_layers.cpp b/code/validation_layers.cpp
@@ -71,8 +71,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/vertex_buffer.cpp b/code/vertex_buffer.cpp
@@ -81,8 +81,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/vertex_input.cpp b/code/vertex_input.cpp
@@ -81,8 +81,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>
diff --git a/code/window_surface.cpp b/code/window_surface.cpp
@@ -72,8 +72,10 @@ class VDeleter {
     }
 
     void operator=(T rhs) {
-        cleanup();
-        object = rhs;
+        if (rhs != object) {
+            cleanup();
+            object = rhs;
+        }
     }
 
     template<typename V>

Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,10 @@ public:`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`void operator=(T rhs) {`
`155`		`- cleanup();`
`156`		`- object = rhs;`
	`155`	`+ if (rhs != object) {`
	`156`	`+ cleanup();`
	`157`	`+ object = rhs;`
	`158`	`+ }`
`157`	`159`	`}`
`158`	`160`
`159`	`161`	`template<typename V>`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,10 @@ class VDeleter {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`void operator=(T rhs) {`
`46`		`- cleanup();`
`47`		`- object = rhs;`
	`46`	`+ if (rhs != object) {`
	`47`	`+ cleanup();`
	`48`	`+ object = rhs;`
	`49`	`+ }`
`48`	`50`	`}`
`49`	`51`
`50`	`52`	`template<typename V>`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,10 @@ class VDeleter {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`void operator=(T rhs) {`
`81`		`- cleanup();`
`82`		`- object = rhs;`
	`81`	`+ if (rhs != object) {`
	`82`	`+ cleanup();`
	`83`	`+ object = rhs;`
	`84`	`+ }`
`83`	`85`	`}`
`84`	`86`
`85`	`87`	`template<typename V>`
Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,10 @@ class VDeleter {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`void operator=(T rhs) {`
`91`		`- cleanup();`
`92`		`- object = rhs;`
	`91`	`+ if (rhs != object) {`
	`92`	`+ cleanup();`
	`93`	`+ object = rhs;`
	`94`	`+ }`
`93`	`95`	`}`
`94`	`96`
`95`	`97`	`template<typename V>`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,10 @@ class VDeleter {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`void operator=(T rhs) {`
`87`		`- cleanup();`
`88`		`- object = rhs;`
	`87`	`+ if (rhs != object) {`
	`88`	`+ cleanup();`
	`89`	`+ object = rhs;`
	`90`	`+ }`
`89`	`91`	`}`
`90`	`92`
`91`	`93`	`template<typename V>`