From 9d6cc4d6428c22d2efb627dde4f9eb9f018ded7d Mon Sep 17 00:00:00 2001
From: foreman <dl.swbuild@amd.com>
Date: Thu, 19 Dec 2019 15:57:37 -0500
Subject: [PATCH] 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: f02b4ffd82512528e9949aaaff0eb3d98e35e85a]
---
 projects/hip/api/hip/hip_memory.cpp  | 2 +-
 projects/hip/api/hip/hip_texture.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/projects/hip/api/hip/hip_memory.cpp b/projects/hip/api/hip/hip_memory.cpp
index 49895e67e9..7e4b41aa5a 100644
--- a/projects/hip/api/hip/hip_memory.cpp
+++ b/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;
diff --git a/projects/hip/api/hip/hip_texture.cpp b/projects/hip/api/hip/hip_texture.cpp
index a4712de1cb..8d7f7945bb 100644
--- a/projects/hip/api/hip/hip_texture.cpp
+++ b/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: