P4 to Git Change 1133818 by gandryey@gera-w8 on 2015/03/24 11:30:12

ECR #304775 - Mipmaps support in OCL
	- Add support for clEnqueueMapImage/Unmap functionality

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/cl_memobj.cpp#76 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#175 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#241 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.cpp#503 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpudevice.hpp#140 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpumemory.cpp#120 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuresource.cpp#212 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuvirtual.cpp#356 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsadevice.cpp#89 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa/hsadevice.hpp#46 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsadevice.cpp#27 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/hsa_foundation/hsadevice.hpp#13 edit
... //depot/stg/opencl/drivers/opencl/runtime/platform/commandqueue.hpp#14 edit

rocclr/runtime/device/gpu/gpuresource.cpp

@@ -664,6 +664,9 @@ Resource::create(MemoryType memType, CreateParams* params, bool heap)
         viewLevel  = imageView->level_;
         gslResource = imageView->resource_->gslResource();
         viewOwner_  = imageView->resource_;
+        if (viewLevel != 0) {
+            viewFlags |= CAL_RESALLOCSLICEVIEW_LEVEL;
+        }
         if (viewLayer != 0) {
             viewFlags |= CAL_RESALLOCSLICEVIEW_LEVEL_AND_LAYER;
         }
@@ -1662,7 +1665,7 @@ Resource::mapLayers(VirtualGPU* gpu, CALuint flags)
         sliceResource = dev().resAllocView(
             gslResource(), gslSize,
             calOffset, cal()->format_, cal()->channelOrder_, gslDim,
-            0, i, CAL_RESALLOCSLICEVIEW_LAYER);
+            0, i, CAL_RESALLOCSLICEVIEW_LEVEL_AND_LAYER);
         if (0 == sliceResource) {
             LogError("Map layer. resAllocSliceView failed!");
             return NULL;
@@ -1772,7 +1775,7 @@ Resource::unmapLayers(VirtualGPU* gpu)
             sliceResource = dev().resAllocView(
                 gslResource(), gslSize,
                 calOffset, cal()->format_, cal()->channelOrder_, gslDim,
-                0, i, CAL_RESALLOCSLICEVIEW_LAYER);
+                0, i, CAL_RESALLOCSLICEVIEW_LEVEL_AND_LAYER);
             if (0 == sliceResource) {
                 LogError("Unmap layer. resAllocSliceView failed!");
                 return;