From 897b8b48f576afc7d3e408302d38afef52d1fa88 Mon Sep 17 00:00:00 2001 From: Rahul Garg Date: Wed, 28 Mar 2018 15:36:57 +0530 Subject: [PATCH] Remove textureObj kernel argument for HIP/HCC path [ROCm/clr commit: 35bc23ecc39f1b0c7e854fbae3872f25c9fef48a] --- .../clr/hipamd/tests/src/texture/hipTextureRef2D.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/projects/clr/hipamd/tests/src/texture/hipTextureRef2D.cpp b/projects/clr/hipamd/tests/src/texture/hipTextureRef2D.cpp index 6f879f80c8..c4c0b9e2fe 100644 --- a/projects/clr/hipamd/tests/src/texture/hipTextureRef2D.cpp +++ b/projects/clr/hipamd/tests/src/texture/hipTextureRef2D.cpp @@ -14,17 +14,10 @@ texture tex; bool testResult = true; __global__ void tex2DKernel(float* outputData, -#ifdef __HIP_PLATFORM_HCC__ - hipTextureObject_t textureObject, -#endif int width, int height) { int x = blockIdx.x * blockDim.x + threadIdx.x; int y = blockIdx.y * blockDim.y + threadIdx.y; -#ifdef __HIP_PLATFORM_HCC__ - outputData[y * width + x] = tex2D(tex, textureObject, x, y); -#else outputData[y * width + x] = tex2D(tex, x, y); -#endif } void runTest(int argc, char** argv); @@ -73,12 +66,7 @@ void runTest(int argc, char** argv) { dim3 dimBlock(16, 16, 1); dim3 dimGrid(width / dimBlock.x, height / dimBlock.y, 1); -#ifdef __HIP_PLATFORM_HCC__ - hipLaunchKernelGGL(tex2DKernel, dim3(dimGrid), dim3(dimBlock), 0, 0, dData, tex.textureObject, - width, height); -#else hipLaunchKernelGGL(tex2DKernel, dim3(dimGrid), dim3(dimBlock), 0, 0, dData, width, height); -#endif hipDeviceSynchronize(); float* hOutputData = (float*)malloc(size);