@@ -28,6 +28,12 @@ uniform mat3 ccm;
uniform float gamma;
uniform float contrastExp;
+struct samples_3x3 {
+ float row0a, row0b, row0c;
+ float row1a, center, row1c;
+ float row2a, row2b, row2c;
+};
+
float apply_contrast(float value)
{
// Apply simple S-curve
@@ -42,10 +48,26 @@ float fetch(float x, float y)
return texture2D(tex_y, vec2(x, y)).r;
}
+void sample_3x3(inout samples_3x3 samples)
+{
+ samples.row0a = fetch(xCoord[1], yCoord[2]);
+ samples.row0b = fetch(center.x, yCoord[2]);
+ samples.row0c = fetch(xCoord[2], yCoord[2]);
+ samples.row1a = fetch(xCoord[1], center.y);
+ samples.center = fetch(center.x, center.y);
+ samples.row1c = fetch(xCoord[2], center.y);
+ samples.row2a = fetch(xCoord[1], yCoord[1]);
+ samples.row2b = fetch(center.x, yCoord[1]);
+ samples.row2c = fetch(xCoord[2], yCoord[1]);
+}
+
void main(void) {
+ samples_3x3 samples;
vec3 rgb;
- float C = fetch(center.x, center.y); // ( 0, 0)
+ sample_3x3(samples);
+
+ float C = samples.center;
/* Which of the four CFA phases are we on (0 = even). Same as McGuire. */
vec2 alternate = mod(floor(center.zw), 2.0);
@@ -53,36 +75,36 @@ void main(void) {
bool even_row = alternate.y < 1.0;
/*
- * +----+----+----+
- * | D2 | A1 | D3 |
- * +----+----+----+
- * | B0 | C | B1 |
- * +----+----+----+
- * | D0 | A0 | D1 |
- * +----+----+----+
+ * +-------+-------+-------+
+ * | row0a | row0b | row0c |
+ * +-------+-------+-------+
+ * | row1a | center| row1c |
+ * +-------+-------+-------+
+ * | row2a | row2b | row2c |
+ * +-------+-------+-------+
*
- * patterns.x = (A0 + A1) / 2 vertical neighbours
- * patterns.y = (B0 + B1) / 2 horizontal neighbours
- * patterns.z = (A0+A1+B0+B1) / 4 cross average (green at R/B sites)
- * patterns.w = (D0+D1+D2+D3) / 4 diagonal average (other colour at R/B sites)
+ * patterns.x = (row2b + row0b) / 2 vertical neighbours
+ * patterns.y = (row1a + row1c) / 2 horizontal neighbours
+ * patterns.z = (row2b + row0b + row1a + row1c) / 4 cross average (green at R/B sites)
+ * patterns.w = (row2a + row2c + row0a + row0c) / 4 diagonal average (other colour at R/B sites)
*
* xCoord[1] = -1, xCoord[2] = +1, yCoord[1] = -1, yCoord[2] = +1
* (xCoord[0]/[3] and yCoord[0]/[3] = +-2 are unused here; the vertex
* shader still emits them so the VS is identical to the McGuire path).
*/
vec4 patterns = vec4(
- fetch(center.x, yCoord[1]), /* A0: ( 0,-1) */
- fetch(xCoord[1], center.y), /* B0: (-1, 0) */
- fetch(xCoord[1], yCoord[1]), /* D0: (-1,-1) */
- fetch(xCoord[2], yCoord[1])); /* D1: ( 1,-1) */
+ samples.row2b, /* row2b: ( 0,-1) */
+ samples.row1a, /* row1a: (-1, 0) */
+ samples.row2a, /* row2a: (-1,-1) */
+ samples.row2c); /* row2c: ( 1,-1) */
vec4 temp = vec4(
- fetch(center.x, yCoord[2]), /* A1: ( 0, 1) */
- fetch(xCoord[2], center.y), /* B1: ( 1, 0) */
- fetch(xCoord[2], yCoord[2]), /* D3: ( 1, 1) */
- fetch(xCoord[1], yCoord[2])); /* D2: (-1, 1) */
+ samples.row0b, /* row0b: ( 0, 1) */
+ samples.row1c, /* row1c: ( 1, 0) */
+ samples.row0c, /* row0c: ( 1, 1) */
+ samples.row0a); /* row0a: (-1, 1) */
patterns = (patterns + temp) * 0.5;
- /* .x=(A0+A1)/2 .y=(B0+B1)/2 .z=(D0+D3)/2 .w=(D1+D2)/2 */
+ /* .x=(row2b+row0b)/2 .y=(row1a+row1c)/2 .z=(row2a+row0c)/2 .w=(row2c+row0a)/2 */
patterns.w = (patterns.z + patterns.w) * 0.5; /* diagonal avg */
patterns.z = (patterns.x + patterns.y) * 0.5; /* cross avg */
Sample the raw bayer pixels into a structure. This makes the code a bit more readable and sets us up for fetching pixels once in the code when doing statistics. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- .../shaders/bayer_glr16f_to_rgba.frag | 64 +++++++++++++------ 1 file changed, 43 insertions(+), 21 deletions(-)