P4 to Git Change 2048698 by jujiang@JJ-HIP on 2019/12/19 15:52:21

SWDEV-215536 - [HIP][Windows]Output mismatch with tex2DLayered()

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#93 edit
... //depot/stg/opencl/drivers/opencl/api/hip/hip_texture.cpp#31 edit


[ROCm/hip commit: f02b4ffd82]

projects/hip/api/hip/hip_memory.cpp

@@ -505,12 +505,12 @@ hipError_t hipMalloc3DArray(hipArray_t* array, const struct hipChannelFormatDesc
 
  // Dummy flags check
    switch (flags) {
-    case hipArrayLayered:
     case hipArrayCubemap:
     case hipArraySurfaceLoadStore:
     case hipArrayTextureGather:
         assert(0 && "Unspported");
         break;
+    case hipArrayLayered:
     case hipArrayDefault:
     default:
         break;

projects/hip/api/hip/hip_texture.cpp

@@ -581,6 +581,7 @@ hipError_t ihipBindTextureToArrayImpl(TlsData* tls, int dim, enum hipTextureRead
       clType = CL_MEM_OBJECT_IMAGE2D;
       break;
     case 3:
+    case hipTextureType2DLayered:
       clType = CL_MEM_OBJECT_IMAGE3D;
       break;
     default: