From 81ba0fcfd9fe1477c55c23ebb5dead3ed53477a2 Mon Sep 17 00:00:00 2001 From: Vlad Sytchenko Date: Fri, 22 May 2020 14:13:50 -0400 Subject: [PATCH] Reenable texture reference tests Change-Id: I77024476cff77951d61dc48f7e30094d6b47266c --- tests/src/texture/hipBindTex2DPitch.cpp | 2 +- tests/src/texture/hipBindTexRef1DFetch.cpp | 2 +- tests/src/texture/hipNormalizedFloatValueTex.cpp | 14 +------------- tests/src/texture/hipTextureRef2D.cpp | 2 +- tests/src/texture/simpleTexture2DLayered.cpp | 2 +- tests/src/texture/simpleTexture3D.cpp | 2 +- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/tests/src/texture/hipBindTex2DPitch.cpp b/tests/src/texture/hipBindTex2DPitch.cpp index 2fd3f1228d..3be39fb911 100644 --- a/tests/src/texture/hipBindTex2DPitch.cpp +++ b/tests/src/texture/hipBindTex2DPitch.cpp @@ -18,7 +18,7 @@ THE SOFTWARE. */ /*HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr + * BUILD: %t %s ../test_common.cpp * TEST: %t * HIT_END */ diff --git a/tests/src/texture/hipBindTexRef1DFetch.cpp b/tests/src/texture/hipBindTexRef1DFetch.cpp index eeaf42129f..546e9775e8 100644 --- a/tests/src/texture/hipBindTexRef1DFetch.cpp +++ b/tests/src/texture/hipBindTexRef1DFetch.cpp @@ -22,7 +22,7 @@ THE SOFTWARE. /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr + * BUILD: %t %s ../test_common.cpp * TEST: %t * HIT_END */ diff --git a/tests/src/texture/hipNormalizedFloatValueTex.cpp b/tests/src/texture/hipNormalizedFloatValueTex.cpp index 95b7c1d879..f365240543 100644 --- a/tests/src/texture/hipNormalizedFloatValueTex.cpp +++ b/tests/src/texture/hipNormalizedFloatValueTex.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc hcc rocclr + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc hcc * TEST: %t * HIT_END */ @@ -42,24 +42,12 @@ static float getNormalizedValue(const float value, return value; } -#if __HIP__ -__hip_pinned_shadow__ -#endif texture texc; -#if __HIP__ -__hip_pinned_shadow__ -#endif texture texuc; -#if __HIP__ -__hip_pinned_shadow__ -#endif texture texs; -#if __HIP__ -__hip_pinned_shadow__ -#endif texture texus; diff --git a/tests/src/texture/hipTextureRef2D.cpp b/tests/src/texture/hipTextureRef2D.cpp index 4f00260998..e39c36638c 100644 --- a/tests/src/texture/hipTextureRef2D.cpp +++ b/tests/src/texture/hipTextureRef2D.cpp @@ -1,5 +1,5 @@ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr + * BUILD: %t %s ../test_common.cpp * TEST: %t * HIT_END */ diff --git a/tests/src/texture/simpleTexture2DLayered.cpp b/tests/src/texture/simpleTexture2DLayered.cpp index 1424976716..d8db1308e3 100644 --- a/tests/src/texture/simpleTexture2DLayered.cpp +++ b/tests/src/texture/simpleTexture2DLayered.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM rocclr + * BUILD: %t %s ../test_common.cpp * TEST: %t * HIT_END */ diff --git a/tests/src/texture/simpleTexture3D.cpp b/tests/src/texture/simpleTexture3D.cpp index bd342df1c3..ca6695f619 100644 --- a/tests/src/texture/simpleTexture3D.cpp +++ b/tests/src/texture/simpleTexture3D.cpp @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* HIT_START - * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc rocclr + * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc * TEST: %t * HIT_END */