P4 to Git Change 1159286 by gandryey@gera-ubuntu14 on 2015/06/09 10:30:28

ECR #304775 - Mipmaps support
	- Fix clCopyImages failures under Linux. Unmap for READ was skipping the view destruction. Combine READ/WRITE map/unmap paths for mipmap textures

Affected files ...

... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#179 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#364 edit

rocclr/runtime/device/device.cpp

@@ -615,13 +615,13 @@ Memory::saveMapInfo(
     if (mapFlags & (CL_MAP_WRITE | CL_MAP_WRITE_INVALIDATE_REGION)) {
         writeMapInfo_.origin_ = origin;
         writeMapInfo_.region_ = region;
-        writeMapInfo_.baseMip_ = baseMip;
         writeMapInfo_.entire_ = entire;
         flags_ |= UnmapWrite;
     }
     if (mapFlags & CL_MAP_READ) {
         flags_ |= UnmapRead;
     }
+    writeMapInfo_.baseMip_ = baseMip;
 }
 
 Program::Program(amd::Device& device)