commit 90b0ba8dfffef3096c2bc5c1a418fb5bb01011e1
author Nicolas Capens <capn@google.com> Fri May 08 12:59:44 2015 -0400
committer Nicolas Capens <capn@google.com> Sat May 09 03:22:57 2015 +0000
tree cdba7beeadb67493a955d82131c0c6c07bff389a
parent 6881301efd5497cd1869fba641fbb298dad55a33

Fix rendering to a destroyed gralloc buffer.

Wait for draw calls that use the Android native image to finish before
dereferencing the buffer and potentially destroying it.

Bug 20885669

Change-Id: I1c8f56e5065ad4c77d7b950feec4505c2e109a47
Reviewed-on: https://swiftshader-review.googlesource.com/3074
Reviewed-by: Greg Hartman <ghartman@google.com>
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/OpenGL/common/Image.hpp

diff --git a/src/OpenGL/common/Image.hpp b/src/OpenGL/common/Image.hpp
index 60b0176..fe7d1df 100644
--- a/src/OpenGL/common/Image.hpp
+++ b/src/OpenGL/common/Image.hpp
@@ -183,12 +183,13 @@
 private:

 	ANativeWindowBuffer *nativeBuffer;

 

-	virtual ~AndroidNativeImage() { }

-

-	void setNativeBuffer(ANativeWindowBuffer* buffer)

+	virtual ~AndroidNativeImage()

 	{

-		nativeBuffer = buffer;

-		nativeBuffer->common.incRef(&nativeBuffer->common);

+		// Wait for any draw calls that use this image to finish

+		resource->lock(sw::DESTRUCT);

+		resource->unlock();

+

+		nativeBuffer->common.decRef(&nativeBuffer->common);

 	}

 

 	virtual void *lockInternal(int x, int y, int z, sw::Lock lock, sw::Accessor client)

@@ -255,15 +256,6 @@
 	{

 		GrallocModule::getInstance()->unlock(nativeBuffer->handle);

 	}

-

-	virtual void destroyShared()   // Release a shared image

-	{

-		if(nativeBuffer)

-		{

-			nativeBuffer->common.decRef(&nativeBuffer->common);

-		}

-		egl::Image::destroyShared();

-	}

 };

 

 #endif  // __ANDROID__

src/Renderer/Surface.hpp

diff --git a/src/Renderer/Surface.hpp b/src/Renderer/Surface.hpp
index b0a0669..31d5d6f 100644
--- a/src/Renderer/Surface.hpp
+++ b/src/Renderer/Surface.hpp
@@ -244,6 +244,9 @@
 

 		static void setTexturePalette(unsigned int *palette);

 

+	protected:

+		sw::Resource *resource;

+

 	private:

 		typedef unsigned char byte;

 		typedef unsigned short word;

@@ -365,7 +368,6 @@
 		static unsigned int *palette;   // FIXME: Not multi-device safe

 		static unsigned int paletteID;

 

-		sw::Resource *resource;

 		bool hasParent;

 	};

 }