AI/rocm-systems
2
0 Garpu 0
Kode Masalah Tarik Permintaan Actions Packages Projects Rilis Wiki Kegiatan

Merge "Enable simpleTexture3D test for VDI" into amd-master-next

Telusuri Sumber 
[ROCm/clr commit: 7da159bac2]
This commit is contained in:
Vladislav Sytchenko authored and Gerrit Code Review committed 2020-03-17 11:41:05 -04:00
2 parents f12c0f1dbb 303e04fa55
melakukan 0c7735ad28
1 file changed
+13 -13
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/hipamd/tests/src/texture/simpleTexture3D.cpp
+13 -13
Melihat File
@@ -21,7 +21,7 @@ THE SOFTWARE.
*/ */
/* HIT_START /* HIT_START
* BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc vdi * BUILD: %t %s ../test_common.cpp EXCLUDE_HIP_PLATFORM nvcc
* TEST: %t * TEST: %t
* HIT_END * HIT_END
*/ */
@@ -52,16 +52,16 @@ __global__ void simpleKernel3DArray(T* outputData,
int height,int depth) int height,int depth)
{ {
for (int i = 0; i < depth; i++) { for (int i = 0; i < depth; i++) {
for (int j = 0; j < height; j++) { for (int j = 0; j < height; j++) {
for (int k = 0; k < width; k++) { for (int k = 0; k < width; k++) {
if(std::is_same<T, float>::value) if(std::is_same<T, float>::value)
outputData[i*width*height + j*width + k] = tex3D(texf, texf.textureObject, k, j, i); outputData[i*width*height + j*width + k] = tex3D(texf, k, j, i);
else if(std::is_same<T, int>::value) else if(std::is_same<T, int>::value)
outputData[i*width*height + j*width + k] = tex3D(texi, texi.textureObject, k, j, i); outputData[i*width*height + j*width + k] = tex3D(texi, k, j, i);
else if(std::is_same<T, char>::value) else if(std::is_same<T, char>::value)
outputData[i*width*height + j*width + k] = tex3D(texc, texc.textureObject, k, j, i); outputData[i*width*height + j*width + k] = tex3D(texc, k, j, i);
} }
} }
} }
} }
@@ -84,10 +84,10 @@ void runTest(int width,int height,int depth,texture<T, hipTextureType3D, hipRead
} }
// Allocate array and copy image data // Allocate array and copy image data
hipChannelFormatDesc channelDesc = hipCreateChannelDesc(sizeof(T)*8, 0, 0, 0, hipChannelFormatKindSigned); hipChannelFormatDesc channelDesc = hipCreateChannelDesc<T>();
hipArray *arr; hipArray *arr;
HIPCHECK(hipMalloc3DArray(&arr, &channelDesc, make_hipExtent(width, height, depth), hipArrayCubemap)); HIPCHECK(hipMalloc3DArray(&arr, &channelDesc, make_hipExtent(width, height, depth), hipArrayDefault));
hipMemcpy3DParms myparms = {0}; hipMemcpy3DParms myparms = {0};
myparms.srcPos = make_hipPos(0,0,0); myparms.srcPos = make_hipPos(0,0,0);
myparms.dstPos = make_hipPos(0,0,0); myparms.dstPos = make_hipPos(0,0,0);