From 0254f99c97b2d22110f37d742f8d3cb1c0064893 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 18 Sep 2019 14:29:25 -0400 Subject: [PATCH] P4 to Git Change 2000486 by vsytchen@vsytchen-remote-ocl-win10 on 2019/09/18 14:25:45 SWDEV-201925 - hipArray3DCreate() not available in HIP/PAL on Windows 1. Implement hipArray3DCreate(). 2. Remove the array size calculation from hipArrayCreate() as it is not used. ReviewBoardURL = http://ocltc.amd.com/reviews/r/18005/diff/ Affected files ... ... //depot/stg/opencl/drivers/opencl/api/hip/hip_memory.cpp#71 edit --- api/hip/hip_memory.cpp | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/api/hip/hip_memory.cpp b/api/hip/hip_memory.cpp index b1f1f40aec..00b75af5b1 100644 --- a/api/hip/hip_memory.cpp +++ b/api/hip/hip_memory.cpp @@ -446,11 +446,6 @@ hipError_t hipArrayCreate(hipArray** array, const HIP_ARRAY_DESCRIPTOR* pAllocat &channelOrder, &channelType); const cl_image_format image_format = { channelOrder, channelType }; - size_t size = pAllocateArray->Width; - if (pAllocateArray->Height > 0) { - size = size * pAllocateArray->Height; - } - size_t pitch = 0; hipError_t status = ihipMallocPitch(ptr, &pitch, array[0]->width, array[0]->height, 1, CL_MEM_OBJECT_IMAGE2D, &image_format); @@ -501,6 +496,33 @@ hipError_t hipMallocArray(hipArray** array, const hipChannelFormatDesc* desc, HIP_RETURN(status); } +hipError_t hipArray3DCreate(hipArray** array, const HIP_ARRAY3D_DESCRIPTOR* pAllocateArray) { + HIP_INIT_API(array, pAllocateArray); + + *array = (hipArray*)malloc(sizeof(hipArray)); + array[0]->type = pAllocateArray->Flags; + array[0]->width = pAllocateArray->Width; + array[0]->height = pAllocateArray->Height; + array[0]->depth = pAllocateArray->Depth; + array[0]->Format = pAllocateArray->Format; + array[0]->NumChannels = pAllocateArray->NumChannels; + array[0]->isDrv = true; + array[0]->textureType = hipTextureType3D; + void** ptr = &array[0]->data; + + cl_channel_order channelOrder; + cl_channel_type channelType; + getDrvChannelOrderAndType(pAllocateArray->Format, pAllocateArray->NumChannels, + &channelOrder, &channelType); + + const cl_image_format image_format = { channelOrder, channelType }; + size_t pitch = 0; + hipError_t status = ihipMallocPitch(ptr, &pitch, array[0]->width, array[0]->height, array[0]->depth, CL_MEM_OBJECT_IMAGE3D, + &image_format); + + HIP_RETURN(status); +} + hipError_t hipMalloc3DArray(hipArray_t* array, const struct hipChannelFormatDesc* desc, struct hipExtent extent, unsigned int flags) { HIP_INIT_API(array, desc, &extent, flags);