projects
/
GPU.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fin du TP convolution. (Constant memory + Texture).
[GPU.git]
/
WCudaMSE
/
Student_Cuda_Image
/
src
/
cpp
/
core
/
01_Rippling
/
moo
/
device
/
ripplingDevice.cu
diff --git
a/WCudaMSE/Student_Cuda_Image/src/cpp/core/01_Rippling/moo/device/ripplingDevice.cu
b/WCudaMSE/Student_Cuda_Image/src/cpp/core/01_Rippling/moo/device/ripplingDevice.cu
index
3e3235f
..
3dc4557
100755
(executable)
--- a/
WCudaMSE/Student_Cuda_Image/src/cpp/core/01_Rippling/moo/device/ripplingDevice.cu
+++ b/
WCudaMSE/Student_Cuda_Image/src/cpp/core/01_Rippling/moo/device/ripplingDevice.cu
@@
-46,11
+46,10
@@
__global__ void rippling(uchar4* ptrDevPixels, int w, int h, float t)
\r
const int TID = Indice2D::tid();
\r
const int NB_THREAD = Indice2D::nbThread();
\r
\r
const int TID = Indice2D::tid();
\r
const int NB_THREAD = Indice2D::nbThread();
\r
-
\r
const int WH = w * h;
\r
\r
uchar4 color;
\r
const int WH = w * h;
\r
\r
uchar4 color;
\r
- color.z = 255;
\r
+ color.z = 255;
// Par défaut, l'image est opaque.
\r
\r
int pixelI;
\r
int pixelJ;
\r
\r
int pixelI;
\r
int pixelJ;
\r
@@
-58,11
+57,9
@@
__global__ void rippling(uchar4* ptrDevPixels, int w, int h, float t)
int s = TID;
\r
while (s < WH)
\r
{
\r
int s = TID;
\r
while (s < WH)
\r
{
\r
- IndiceTools::toIJ(s, w, &pixelI, &pixelJ); // update (pixelI, pixelJ)
\r
-
\r
- ripplingMath.color(pixelI, pixelJ, t, color); // update color
\r
+ IndiceTools::toIJ(s, w, &pixelI, &pixelJ);
\r
+ ripplingMath.color(pixelI, pixelJ, t, color);
\r
ptrDevPixels[s] = color;
\r
ptrDevPixels[s] = color;
\r
-
\r
s += NB_THREAD;
\r
}
\r
}
\r
s += NB_THREAD;
\r
}
\r
}
\r