PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: shaders: Rename bayer_8 to bayer_unpacked

Browse Source 
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>
This commit is contained in:
Milan Zamazal
2026-01-06 17:00:40 +00:00
committed by Kieran Bingham
parent 76973876b8
commit c31d6dba03
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/apps/qcam/assets/shader/shaders.qrc
View File

@@ -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>

16
src/apps/qcam/viewfinder_gl.cpp
View File

@@ -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:

0
src/libcamera/shaders/bayer_8.frag → src/libcamera/shaders/bayer_unpacked.frag
View File

0
src/libcamera/shaders/bayer_8.vert → src/libcamera/shaders/bayer_unpacked.vert
View File

4
src/libcamera/shaders/meson.build
View File

@@ -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',
])