From 8da3a96f2bfb1b4aeb5ce0bcf0c7f7a009c076cf Mon Sep 17 00:00:00 2001
From: Rahul Garg <rahul.garg@amd.com>
Date: Tue, 18 Sep 2018 14:10:03 +0530
Subject: [PATCH] Fixed get alignment offset test for NVCC

- Removed dtest hipGetAlgntoffset2D.cpp
- hipGetTextureAlignmentOffset is being tested now in hipBindTexRef1DFetch.cpp
---
 tests/src/texture/hipBindTexRef1DFetch.cpp |  5 +-
 tests/src/texture/hipGetAlgntoffset2D.cpp  | 78 ----------------------
 2 files changed, 3 insertions(+), 80 deletions(-)
 delete mode 100644 tests/src/texture/hipGetAlgntoffset2D.cpp

diff --git a/tests/src/texture/hipBindTexRef1DFetch.cpp b/tests/src/texture/hipBindTexRef1DFetch.cpp
index 5d9a1b103b..fa63efc1bb 100644
--- a/tests/src/texture/hipBindTexRef1DFetch.cpp
+++ b/tests/src/texture/hipBindTexRef1DFetch.cpp
@@ -56,7 +56,7 @@ int runTest() {
     int testResult = 1;
     float *texBuf;
     float val[N], output[N];
-    size_t size = 0;
+    size_t offset = 0;
     float *devBuf;
     for (int i = 0; i < N; i++) {
         val[i] = (float)i;
@@ -74,7 +74,8 @@ int runTest() {
     tex.filterMode = hipFilterModePoint;
     tex.normalized = 0;
 
-    HIPCHECK(hipBindTexture(&size, tex, (void *)texBuf, chanDesc, N * sizeof(float)));
+    HIPCHECK(hipBindTexture(&offset, tex, (void *)texBuf, chanDesc, N * sizeof(float)));
+    HIPCHECK(hipGetTextureAlignmentOffset(&offset,&tex));
 
     dim3 dimBlock(64, 1, 1);
     dim3 dimGrid(N / dimBlock.x, 1, 1);
diff --git a/tests/src/texture/hipGetAlgntoffset2D.cpp b/tests/src/texture/hipGetAlgntoffset2D.cpp
deleted file mode 100644
index 3a4cc7dfc8..0000000000
--- a/tests/src/texture/hipGetAlgntoffset2D.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Copyright (c) 2015-Present Advanced Micro Devices, Inc. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-/* HIT_START
- * BUILD: %t %s ../test_common.cpp
- * RUN: %t
- * HIT_END
- */
-#include <hip/hip_runtime.h>
-#include "test_common.h"
-
-using namespace std;
-#define R 8 //rows, height
-#define C 8 //columns, width
-
-texture<int, hipTextureType2D,hipReadModeElementType> tex;
-
-bool runTest(void);
-
-int main(int argc, char** argv) {
-    bool testResult=runTest();
-
-    if (testResult) {
-        passed();
-    } else {
-        exit(EXIT_FAILURE);
-    }
-}
-
-bool runTest()
-{
-int val[R][C],i,j;
-size_t offset;
-
-for(i=0;i<R;i++)
-    for(j=0;j<C;j++)
-	{
-	 val[i][j]=(i+1)*(j+1);
-	}
-hipChannelFormatDesc chan_desc=hipCreateChannelDesc(32,0,0,0,hipChannelFormatKindSigned);
-hipArray *hipArray;
-HIPCHECK(hipMallocArray(&hipArray, &chan_desc,C,R,0));
-
-HIPCHECK(hipMemcpyToArray(hipArray,0,0, val, R*C*sizeof(int), hipMemcpyHostToDevice));
-
-tex.addressMode[0]=hipAddressModeWrap;
-tex.addressMode[1]=hipAddressModeWrap;
-tex.filterMode=hipFilterModePoint;
-tex.normalized=0;
-
-HIPCHECK(hipBindTextureToArray(&tex, hipArray, &chan_desc));
-HIPCHECK(hipGetTextureAlignmentOffset(&offset,&tex));
-HIPCHECK(hipUnbindTexture(&tex));
-HIPCHECK(hipFreeArray(hipArray));
-if(offset != 0)
-    return false;
-  else
-    return true;
-}