commit 2c5b4455854d3f622622eea2c8d1f243ba4fff84
author Nicolas Caramelli <caramelli.devel@gmail.com> Wed Jul 29 17:46:21 2020 +0200
committer Alexis Hétu <sugoi@google.com> Thu Sep 03 19:58:56 2020 +0000
tree da459ed0bd77eb6c21b07216bde942ca5a24948c
parent 75690ce7ef4a189c914cc27ebbd1dbc1155382cb

Minor change in detachImage() for Xcb, Xlib, Wayland WSIs

Bug: b/162351826
Change-Id: Idd8e6c869ffa99945e7a6bc7701a7ab854f18432
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/47188
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>

src/WSI/WaylandSurfaceKHR.cpp

diff --git a/src/WSI/WaylandSurfaceKHR.cpp b/src/WSI/WaylandSurfaceKHR.cpp
index ac7f2fc..405b44f 100644
--- a/src/WSI/WaylandSurfaceKHR.cpp
+++ b/src/WSI/WaylandSurfaceKHR.cpp
@@ -92,7 +92,7 @@
 		munmap(wlImage->data, extent.height * stride);
 		wl_buffer_destroy(wlImage->buffer);
 		delete wlImage;
-		imageMap.erase(image);
+		imageMap.erase(it);
 	}
 }
 

src/WSI/XcbSurfaceKHR.cpp

diff --git a/src/WSI/XcbSurfaceKHR.cpp b/src/WSI/XcbSurfaceKHR.cpp
index a8ce43f..3b438b3 100644
--- a/src/WSI/XcbSurfaceKHR.cpp
+++ b/src/WSI/XcbSurfaceKHR.cpp
@@ -151,7 +151,7 @@
 	if(it != graphicsContexts.end())
 	{
 		libXcb->xcb_free_gc(connection, it->second);
-		graphicsContexts.erase(image);
+		graphicsContexts.erase(it);
 	}
 }
 

src/WSI/XlibSurfaceKHR.cpp

diff --git a/src/WSI/XlibSurfaceKHR.cpp b/src/WSI/XlibSurfaceKHR.cpp
index 9885e3c..4f748f7 100644
--- a/src/WSI/XlibSurfaceKHR.cpp
+++ b/src/WSI/XlibSurfaceKHR.cpp
@@ -77,7 +77,7 @@
 		XImage *xImage = it->second;
 		xImage->data = nullptr;  // the XImage does not actually own the buffer
 		XDestroyImage(xImage);
-		imageMap.erase(image);
+		imageMap.erase(it);
 	}
 }