From c31d6dba0386dbe0763072b69d5bf417c37744df Mon Sep 17 00:00:00 2001
From: Milan Zamazal <mzamazal@redhat.com>
Date: Tue, 6 Jan 2026 17:00:40 +0000
Subject: [PATCH] libcamera: shaders: Rename bayer_8 to bayer_unpacked

bayer_8.* shaders are now used for all unpacked sensor data formats,
regardless of the pixel bit width.  Let's rename the "8-bit" shaders to
avoid confusion.

Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Tested-by: Robert Mader <robert.mader@collabora.com>
Tested-by: Hans de Goede <johannes.goede@oss.qualcomm.com> # ThinkPad T14s gen 6 (arm64) ov02c10 + X1c gen 12 ov08x40
Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com> # Lenovo X13s
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/apps/qcam/assets/shader/shaders.qrc          |  4 ++--
 src/apps/qcam/viewfinder_gl.cpp                  | 16 ++++++++--------
 .../{bayer_8.frag => bayer_unpacked.frag}        |  0
 .../{bayer_8.vert => bayer_unpacked.vert}        |  0
 src/libcamera/shaders/meson.build                |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename src/libcamera/shaders/{bayer_8.frag => bayer_unpacked.frag} (100%)
 rename src/libcamera/shaders/{bayer_8.vert => bayer_unpacked.vert} (100%)

diff --git a/src/apps/qcam/assets/shader/shaders.qrc b/src/apps/qcam/assets/shader/shaders.qrc
index 7369cdbe..f11a68ef 100644
--- a/src/apps/qcam/assets/shader/shaders.qrc
+++ b/src/apps/qcam/assets/shader/shaders.qrc
@@ -6,8 +6,8 @@
 	<file>../../../../../src/libcamera/shaders/YUV_3_planes.frag</file>
 	<file>../../../../../src/libcamera/shaders/YUV_packed.frag</file>
 	<file>../../../../../src/libcamera/shaders/bayer_1x_packed.frag</file>
-	<file>../../../../../src/libcamera/shaders/bayer_8.frag</file>
-	<file>../../../../../src/libcamera/shaders/bayer_8.vert</file>
+	<file>../../../../../src/libcamera/shaders/bayer_unpacked.frag</file>
+	<file>../../../../../src/libcamera/shaders/bayer_unpacked.vert</file>
 	<file>../../../../../src/libcamera/shaders/identity.vert</file>
 </qresource>
 </RCC>
diff --git a/src/apps/qcam/viewfinder_gl.cpp b/src/apps/qcam/viewfinder_gl.cpp
index 0d06122f..1d3f4891 100644
--- a/src/apps/qcam/viewfinder_gl.cpp
+++ b/src/apps/qcam/viewfinder_gl.cpp
@@ -235,29 +235,29 @@ bool ViewFinderGL::selectFormat(const libcamera::PixelFormat &format)
 	case libcamera::formats::SBGGR8:
 		firstRed_.setX(1.0);
 		firstRed_.setY(1.0);
-		vertexShaderFile_ = ":src/libcamera/shaders/bayer_8.vert";
-		fragmentShaderFile_ = ":src/libcamera/shaders/bayer_8.frag";
+		vertexShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.vert";
+		fragmentShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.frag";
 		textureMinMagFilters_ = GL_NEAREST;
 		break;
 	case libcamera::formats::SGBRG8:
 		firstRed_.setX(0.0);
 		firstRed_.setY(1.0);
-		vertexShaderFile_ = ":src/libcamera/shaders/bayer_8.vert";
-		fragmentShaderFile_ = ":src/libcamera/shaders/bayer_8.frag";
+		vertexShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.vert";
+		fragmentShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.frag";
 		textureMinMagFilters_ = GL_NEAREST;
 		break;
 	case libcamera::formats::SGRBG8:
 		firstRed_.setX(1.0);
 		firstRed_.setY(0.0);
-		vertexShaderFile_ = ":src/libcamera/shaders/bayer_8.vert";
-		fragmentShaderFile_ = ":src/libcamera/shaders/bayer_8.frag";
+		vertexShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.vert";
+		fragmentShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.frag";
 		textureMinMagFilters_ = GL_NEAREST;
 		break;
 	case libcamera::formats::SRGGB8:
 		firstRed_.setX(0.0);
 		firstRed_.setY(0.0);
-		vertexShaderFile_ = ":src/libcamera/shaders/bayer_8.vert";
-		fragmentShaderFile_ = ":src/libcamera/shaders/bayer_8.frag";
+		vertexShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.vert";
+		fragmentShaderFile_ = ":src/libcamera/shaders/bayer_unpacked.frag";
 		textureMinMagFilters_ = GL_NEAREST;
 		break;
 	case libcamera::formats::SBGGR10_CSI2P:
diff --git a/src/libcamera/shaders/bayer_8.frag b/src/libcamera/shaders/bayer_unpacked.frag
similarity index 100%
rename from src/libcamera/shaders/bayer_8.frag
rename to src/libcamera/shaders/bayer_unpacked.frag
diff --git a/src/libcamera/shaders/bayer_8.vert b/src/libcamera/shaders/bayer_unpacked.vert
similarity index 100%
rename from src/libcamera/shaders/bayer_8.vert
rename to src/libcamera/shaders/bayer_unpacked.vert
diff --git a/src/libcamera/shaders/meson.build b/src/libcamera/shaders/meson.build
index 386b342d..dd441a57 100644
--- a/src/libcamera/shaders/meson.build
+++ b/src/libcamera/shaders/meson.build
@@ -4,7 +4,7 @@
 # for the purposes of inclusion in OpenGL debayering
 shader_files = files([
     'bayer_1x_packed.frag',
-    'bayer_8.frag',
-    'bayer_8.vert',
+    'bayer_unpacked.frag',
+    'bayer_unpacked.vert',
     'identity.vert',
 ])