summaryrefslogtreecommitdiffstats
path: root/cuda/2d/par_fp.cu
diff options
context:
space:
mode:
Diffstat (limited to 'cuda/2d/par_fp.cu')
-rw-r--r--cuda/2d/par_fp.cu59
1 files changed, 33 insertions, 26 deletions
diff --git a/cuda/2d/par_fp.cu b/cuda/2d/par_fp.cu
index e947428..cccf672 100644
--- a/cuda/2d/par_fp.cu
+++ b/cuda/2d/par_fp.cu
@@ -34,11 +34,6 @@ along with the ASTRA Toolbox. If not, see <http://www.gnu.org/licenses/>.
#include <list>
#include <cmath>
-typedef texture<float, 2, cudaReadModeElementType> texture2D;
-
-static texture2D gT_volumeTexture;
-
-
namespace astraCUDA {
static const unsigned g_MaxAngles = 2560;
@@ -57,32 +52,40 @@ static const unsigned int g_blockSlices = 64;
#define iPREC_FACTOR 16
-static bool bindVolumeDataTexture(float* data, cudaArray*& dataArray, unsigned int pitch, unsigned int width, unsigned int height)
+static bool bindVolumeDataTexture(float* data, cudaArray*& dataArray, cudaTextureObject_t& texObj, unsigned int pitch, unsigned int width, unsigned int height)
{
- cudaChannelFormatDesc channelDesc = cudaCreateChannelDesc<float>();
+ // TODO: For very small sizes (roughly <=512x128) with few angles (<=180)
+ // not using an array is more efficient.
+
+ cudaChannelFormatDesc channelDesc =
+ cudaCreateChannelDesc(32, 0, 0, 0, cudaChannelFormatKindFloat);
+
dataArray = 0;
cudaMallocArray(&dataArray, &channelDesc, width, height);
cudaMemcpy2DToArray(dataArray, 0, 0, data, pitch*sizeof(float), width*sizeof(float), height, cudaMemcpyDeviceToDevice);
- gT_volumeTexture.addressMode[0] = cudaAddressModeBorder;
- gT_volumeTexture.addressMode[1] = cudaAddressModeBorder;
- gT_volumeTexture.filterMode = cudaFilterModeLinear;
- gT_volumeTexture.normalized = false;
+ cudaResourceDesc resDesc;
+ memset(&resDesc, 0, sizeof(resDesc));
+ resDesc.resType = cudaResourceTypeArray;
+ resDesc.res.array.array = dataArray;
- // TODO: For very small sizes (roughly <=512x128) with few angles (<=180)
- // not using an array is more efficient.
-// cudaBindTexture2D(0, gT_volumeTexture, (const void*)data, channelDesc, width, height, sizeof(float)*pitch);
- cudaBindTextureToArray(gT_volumeTexture, dataArray, channelDesc);
+ cudaTextureDesc texDesc;
+ memset(&texDesc, 0, sizeof(texDesc));
+ texDesc.addressMode[0] = cudaAddressModeBorder;
+ texDesc.addressMode[1] = cudaAddressModeBorder;
+ texDesc.filterMode = cudaFilterModeLinear;
+ texDesc.readMode = cudaReadModeElementType;
+ texDesc.normalizedCoords = 0;
- // TODO: error value?
+ texObj = 0;
- return true;
+ return checkCuda(cudaCreateTextureObject(&texObj, &resDesc, &texDesc, NULL), "par_fp texture");
}
// projection for angles that are roughly horizontal
// (detector roughly vertical)
-__global__ void FPhorizontal_simple(float* D_projData, unsigned int projPitch, unsigned int startSlice, unsigned int startAngle, unsigned int endAngle, const SDimensions dims, float outputScale)
+__global__ void FPhorizontal_simple(float* D_projData, unsigned int projPitch, cudaTextureObject_t tex, unsigned int startSlice, unsigned int startAngle, unsigned int endAngle, const SDimensions dims, float outputScale)
{
const int relDet = threadIdx.x;
const int relAngle = threadIdx.y;
@@ -134,7 +137,7 @@ __global__ void FPhorizontal_simple(float* D_projData, unsigned int projPitch, u
for (int slice = startSlice; slice < endSlice; ++slice)
{
for (int iSubT = 0; iSubT < dims.iRaysPerDet; ++iSubT) {
- fVal += tex2D(gT_volumeTexture, fS, fP);
+ fVal += tex2D<float>(tex, fS, fP);
fP += fSubDetStep;
}
fP += fSliceStep;
@@ -145,7 +148,7 @@ __global__ void FPhorizontal_simple(float* D_projData, unsigned int projPitch, u
for (int slice = startSlice; slice < endSlice; ++slice)
{
- fVal += tex2D(gT_volumeTexture, fS, fP);
+ fVal += tex2D<float>(tex, fS, fP);
fP += fSliceStep;
fS += 1.0f;
}
@@ -159,7 +162,7 @@ __global__ void FPhorizontal_simple(float* D_projData, unsigned int projPitch, u
// projection for angles that are roughly vertical
// (detector roughly horizontal)
-__global__ void FPvertical_simple(float* D_projData, unsigned int projPitch, unsigned int startSlice, unsigned int startAngle, unsigned int endAngle, const SDimensions dims, float outputScale)
+__global__ void FPvertical_simple(float* D_projData, unsigned int projPitch, cudaTextureObject_t tex, unsigned int startSlice, unsigned int startAngle, unsigned int endAngle, const SDimensions dims, float outputScale)
{
const int relDet = threadIdx.x;
const int relAngle = threadIdx.y;
@@ -210,7 +213,7 @@ __global__ void FPvertical_simple(float* D_projData, unsigned int projPitch, uns
for (int slice = startSlice; slice < endSlice; ++slice)
{
for (int iSubT = 0; iSubT < dims.iRaysPerDet; ++iSubT) {
- fVal += tex2D(gT_volumeTexture, fP, fS);
+ fVal += tex2D<float>(tex, fP, fS);
fP += fSubDetStep;
}
fP += fSliceStep;
@@ -221,7 +224,7 @@ __global__ void FPvertical_simple(float* D_projData, unsigned int projPitch, uns
for (int slice = startSlice; slice < endSlice; ++slice)
{
- fVal += tex2D(gT_volumeTexture, fP, fS);
+ fVal += tex2D<float>(tex, fP, fS);
fP += fSliceStep;
fS += 1.0f;
}
@@ -269,7 +272,9 @@ bool FP_simple_internal(float* D_volumeData, unsigned int volumePitch,
assert(angles);
cudaArray* D_dataArray;
- bindVolumeDataTexture(D_volumeData, D_dataArray, volumePitch, dims.iVolWidth, dims.iVolHeight);
+ cudaTextureObject_t D_texObj;
+
+ bindVolumeDataTexture(D_volumeData, D_dataArray, D_texObj, volumePitch, dims.iVolWidth, dims.iVolHeight);
convertAndUploadAngles(angles, dims.iProjAngles, dims.iProjDets);
@@ -313,10 +318,10 @@ bool FP_simple_internal(float* D_volumeData, unsigned int volumePitch,
//printf("angle block: %d to %d, %d\n", blockStart, blockEnd, blockVertical);
if (!blockVertical)
for (unsigned int i = 0; i < dims.iVolWidth; i += g_blockSlices)
- FPhorizontal_simple<<<dimGrid, dimBlock, 0, stream>>>(D_projData, projPitch, i, blockStart, blockEnd, dims, outputScale);
+ FPhorizontal_simple<<<dimGrid, dimBlock, 0, stream>>>(D_projData, projPitch, D_texObj, i, blockStart, blockEnd, dims, outputScale);
else
for (unsigned int i = 0; i < dims.iVolHeight; i += g_blockSlices)
- FPvertical_simple<<<dimGrid, dimBlock, 0, stream>>>(D_projData, projPitch, i, blockStart, blockEnd, dims, outputScale);
+ FPvertical_simple<<<dimGrid, dimBlock, 0, stream>>>(D_projData, projPitch, D_texObj, i, blockStart, blockEnd, dims, outputScale);
}
blockVertical = vertical;
blockStart = a;
@@ -332,6 +337,8 @@ bool FP_simple_internal(float* D_volumeData, unsigned int volumePitch,
cudaFreeArray(D_dataArray);
+ cudaDestroyTextureObject(D_texObj);
+
return ok;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 15:35:23 +0000