P4 to Git Change 1155415 by gandryey@gera-w8 on 2015/05/28 11:39:24

ECR #304775 - Mipmaps support
	- Avoid a bogus error message for a mipmap unmap

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpumemory.cpp#121 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#219 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.hpp#81 edit

rocclr/runtime/device/gpu/gpumemory.cpp

@@ -875,7 +875,9 @@ Memory::decIndMapCount()
     amd::ScopedLock lock(owner()->lockMemoryOps());
 
     if (indirectMapCount_ == 0) {
-        LogError("decIndMapCount() called when indirectMapCount_ already zero");
+        if (!mipMapped()) {
+            LogError("decIndMapCount() called when indirectMapCount_ already zero");
+        }
         return;
     }