modif gillou

[book_gpu.git] / BookGPU / Chapters / chapter3 / code / kernMedian2pix5.cu~

diff --git a/BookGPU/Chapters/chapter3/code/kernMedian2pix5.cu~ b/BookGPU/Chapters/chapter3/code/kernMedian2pix5.cu~
index bb8d5eefd029aa05921827089800758b0aa03b43..b01619eb8bfb0aa95003a3f18f5af946d49369e7 100755 (executable)
--- a/BookGPU/Chapters/chapter3/code/kernMedian2pix5.cu~
+++ b/BookGPU/Chapters/chapter3/code/kernMedian2pix5.cu~
@@ -1,10 +1,11 @@
-__global__ void kernel_median5_2pix( short *output, int i_dim, int j_dim)
+__global__ void kernel_median5_2pix( short *output,
+                                                                        int i_dim, int j_dim)

 {  
 {  

-  int j = __mul24(__mul24(blockIdx.x,blockDim.x) + threadIdx.x,2) ; 
-  int i = __mul24(blockIdx.y,blockDim.y) + threadIdx.y ;
-  int a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13 ;//left window
-  int b6, b7, b8, b9, b10, b11, b12, b13 ;                                               //right window                                                                        
-  
+  int j= __mul24(__mul24(blockIdx.x,blockDim.x) + threadIdx.x,2); 
+  int i= __mul24(blockIdx.y,blockDim.y) + threadIdx.y;
+  int a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,a10,a11,a12,a13;//left window
+  int b6,b7,b8,b9,b10,b11,b12,b13 ;                 //right window                                                                     
+  //first 14 common pixels

   a0  = tex2D(tex_img_ins, j-1, i-2) ;  // first line
   a1  = tex2D(tex_img_ins, j  , i-2) ;
   a2  = tex2D(tex_img_ins, j+1, i-2) ;
   a0  = tex2D(tex_img_ins, j-1, i-2) ;  // first line
   a1  = tex2D(tex_img_ins, j  , i-2) ;
   a2  = tex2D(tex_img_ins, j+1, i-2) ;


@@ -38,7 +39,7 @@ __global__ void kernel_median5_2pix( short *output, int i_dim, int j_dim)
   // separation
   b6=a6; b7=a7; b8=a8; b9=a9; b10=a10; b11=a11; b12=a12; b13=a13;
   
   // separation
   b6=a6; b7=a7; b8=a8; b9=a9; b10=a10; b11=a11; b12=a12; b13=a13;
   

-  // separate selections for the 5 remaining pixels in both windows
+  // separate selections: 5 remaining pixels in both windows

   a13 = tex2D(tex_img_ins, j-2, i-2);
   b13 = tex2D(tex_img_ins, j+3, i-2);
   minmax7(&a7,&a8,&a9,&a10,&a11,&a12,&a13);
   a13 = tex2D(tex_img_ins, j-2, i-2);
   b13 = tex2D(tex_img_ins, j+3, i-2);
   minmax7(&a7,&a8,&a9,&a10,&a11,&a12,&a13);


@@ -62,5 +63,4 @@ __global__ void kernel_median5_2pix( short *output, int i_dim, int j_dim)
 
   output[ __mul24(i, j_dim) +j ] = a12 ; //middle values
   output[ __mul24(i, j_dim) +j+1 ] = b12 ;
 
   output[ __mul24(i, j_dim) +j ] = a12 ; //middle values
   output[ __mul24(i, j_dim) +j+1 ] = b12 ;

- 

 }
 }