commit 02f30cb67e6c17b6baf7871e478c5001b378e210
author Nicolas Capens <capn@google.com> Thu Nov 13 22:55:51 2014 -0500
committer Nicolas Capens <nicolascapens@google.com> Fri Nov 28 01:35:38 2014 +0000
tree c140fb4da53ca74cc44197b4c6fd388752e86a07
parent f160b17926754f5a81b5a0713f7f0f8e6a146558

Reference/release both the image and parent texture.

BUG=18381089

Change-Id: I379deb9a80eef4cc75082a58bfd14e588d7a93a1
Reviewed-on: https://swiftshader-review.googlesource.com/1410
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

src/OpenGL/libGLES_CM/Image.cpp

diff --git a/src/OpenGL/libGLES_CM/Image.cpp b/src/OpenGL/libGLES_CM/Image.cpp
index 981cfc9..261ab90 100644
--- a/src/OpenGL/libGLES_CM/Image.cpp
+++ b/src/OpenGL/libGLES_CM/Image.cpp
@@ -54,7 +54,7 @@
 	{
 		if(parentTexture)
 		{
-			return parentTexture->addRef();
+			parentTexture->addRef();
 		}
 
 		sw::atomicIncrement(&referenceCount);
@@ -64,7 +64,7 @@
 	{
 		if(parentTexture)
 		{
-			return parentTexture->release();
+			parentTexture->release();
 		}
 
 		if(referenceCount > 0)

src/OpenGL/libGLES_CM/libGLES_CM.cpp

diff --git a/src/OpenGL/libGLES_CM/libGLES_CM.cpp b/src/OpenGL/libGLES_CM/libGLES_CM.cpp
index 8179195..7ecdc58 100644
--- a/src/OpenGL/libGLES_CM/libGLES_CM.cpp
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.cpp
@@ -436,7 +436,7 @@
 

 	if(context)

 	{

-		if (renderbuffer != 0 && !context->getRenderbuffer(renderbuffer))

+		if(renderbuffer != 0 && !context->getRenderbuffer(renderbuffer))

 		{

 			// [OpenGL ES 2.0.25] Section 4.4.3 page 112

 			// [OpenGL ES 3.0.2] Section 4.4.2 page 201

src/OpenGL/libGLESv2/Image.cpp

diff --git a/src/OpenGL/libGLESv2/Image.cpp b/src/OpenGL/libGLESv2/Image.cpp
index 2c5dcda..038d18e 100644
--- a/src/OpenGL/libGLESv2/Image.cpp
+++ b/src/OpenGL/libGLESv2/Image.cpp
@@ -53,7 +53,7 @@
 	{
 		if(parentTexture)
 		{
-			return parentTexture->addRef();
+			parentTexture->addRef();
 		}
 
 		sw::atomicIncrement(&referenceCount);
@@ -63,7 +63,7 @@
 	{
 		if(parentTexture)
 		{
-			return parentTexture->release();
+			parentTexture->release();
 		}
 
 		if(referenceCount > 0)

src/Radiance/libRAD/Image.cpp

diff --git a/src/Radiance/libRAD/Image.cpp b/src/Radiance/libRAD/Image.cpp
index 4f41dc0..9b62b4b 100644
--- a/src/Radiance/libRAD/Image.cpp
+++ b/src/Radiance/libRAD/Image.cpp
@@ -53,7 +53,7 @@
 	{
 		if(parentTexture)
 		{
-			return parentTexture->addRef();
+			parentTexture->addRef();
 		}
 
 		sw::atomicIncrement(&referenceCount);
@@ -63,7 +63,7 @@
 	{
 		if(parentTexture)
 		{
-			return parentTexture->release();
+			parentTexture->release();
 		}
 
 		if(referenceCount > 0)