[opencl] Global transparency

elpaso · elpaso · commit 3161b9407dc5 · 2018-08-08T09:20:15.000+02:00
diff --git a/resources/opencl_programs/hillshade.cl b/resources/opencl_programs/hillshade.cl
@@ -6,7 +6,7 @@ __kernel void processNineCellWindow( __global float *scanLine1,
                                        __global float *scanLine3,
                                        __global uchar4 *resultLine, // This is an image BGRA !
                                        __global float *rasterParams //  [ mInputNodataValue, mOutputNodataValue, mZFactor, mCellSizeX, mCellSizeY,
-                                                                    //    azimuthRad, cosZenithRad, sinZenithRad ]
+                                                                    //    azimuthRad, cosZenithRad, sinZenithRad, mOpacity ]
 
                          ) {
 
@@ -31,7 +31,7 @@ __kernel void processNineCellWindow( __global float *scanLine1,
     float res;
     if ( derX == rasterParams[1] || derY == rasterParams[1] )
     {
-      res = rasterParams[1];
+      res = 255.0f;
     }
     else
     {
@@ -49,6 +49,9 @@ __kernel void processNineCellWindow( __global float *scanLine1,
 
     }
 
-    resultLine[i] = (uchar4)(res, res, res, 255);
+    // Opacity
+    res = res * rasterParams[7];
+
+    resultLine[i] = (uchar4)(res, res, res, 255 * rasterParams[7]);
 
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ __kernel void processNineCellWindow( __global float *scanLine1,`
`6`	`6`	`__global float *scanLine3,`
`7`	`7`	`__global uchar4 *resultLine, // This is an image BGRA !`
`8`	`8`	`__global float *rasterParams // [ mInputNodataValue, mOutputNodataValue, mZFactor, mCellSizeX, mCellSizeY,`
`9`		`- // azimuthRad, cosZenithRad, sinZenithRad ]`
	`9`	`+ // azimuthRad, cosZenithRad, sinZenithRad, mOpacity ]`
`10`	`10`
`11`	`11`	`) {`
`12`	`12`
`@@ -31,7 +31,7 @@ __kernel void processNineCellWindow( __global float *scanLine1,`
`31`	`31`	`float res;`
`32`	`32`	`if ( derX == rasterParams[1] \|\| derY == rasterParams[1] )`
`33`	`33`	`{`
`34`		`- res = rasterParams[1];`
	`34`	`+ res = 255.0f;`
`35`	`35`	`}`
`36`	`36`	`else`
`37`	`37`	`{`
`@@ -49,6 +49,9 @@ __kernel void processNineCellWindow( __global float *scanLine1,`
`49`	`49`
`50`	`50`	`}`
`51`	`51`
`52`		`- resultLine[i] = (uchar4)(res, res, res, 255);`
	`52`	`+ // Opacity`
	`53`	`+ res = res * rasterParams[7];`
	`54`	`+`
	`55`	`+ resultLine[i] = (uchar4)(res, res, res, 255 * rasterParams[7]);`
`53`	`56`
`54`	`57`	`}`