NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

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>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
This commit is contained in:
Milan Zamazal 2025-04-29 14:37:05 +02:00 • committed by Bryan O'Donoghue
parent f28498a2fb
commit a2b7c63532
6 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

0
include/libcamera/internal/shaders/bayer_8.frag → include/libcamera/internal/shaders/bayer_unpacked.frag
View file

0
include/libcamera/internal/shaders/bayer_8.vert → include/libcamera/internal/shaders/bayer_unpacked.vert
View file

4
include/libcamera/internal/shaders/meson.build
View file

@ -4,7 +4,7 @@
# for the purposes of inclusion in OpenGL debayering # for the purposes of inclusion in OpenGL debayering
shader_files = files([ shader_files = files([
'bayer_1x_packed.frag', 'bayer_1x_packed.frag',
'bayer_8.frag', 'bayer_unpacked.frag',
'bayer_8.vert', 'bayer_unpacked.vert',
'identity.vert', 'identity.vert',
]) ])

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

@ -6,8 +6,8 @@
<file>../../../../../include/libcamera/internal/shaders/YUV_3_planes.frag</file> <file>../../../../../include/libcamera/internal/shaders/YUV_3_planes.frag</file>
<file>../../../../../include/libcamera/internal/shaders/YUV_packed.frag</file> <file>../../../../../include/libcamera/internal/shaders/YUV_packed.frag</file>
<file>../../../../../include/libcamera/internal/shaders/bayer_1x_packed.frag</file> <file>../../../../../include/libcamera/internal/shaders/bayer_1x_packed.frag</file>
<file>../../../../../include/libcamera/internal/shaders/bayer_8.frag</file> <file>../../../../../include/libcamera/internal/shaders/bayer_unpacked.frag</file>
<file>../../../../../include/libcamera/internal/shaders/bayer_8.vert</file> <file>../../../../../include/libcamera/internal/shaders/bayer_unpacked.vert</file>
<file>../../../../../include/libcamera/internal/shaders/identity.vert</file> <file>../../../../../include/libcamera/internal/shaders/identity.vert</file>
</qresource> </qresource>
</RCC> </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: case libcamera::formats::SBGGR8:
firstRed_.setX(1.0); firstRed_.setX(1.0);
firstRed_.setY(1.0); firstRed_.setY(1.0);
vertexShaderFile_ = ":include/libcamera/internal/shaders/bayer_8.vert"; vertexShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.vert";
fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_8.frag"; fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.frag";
textureMinMagFilters_ = GL_NEAREST; textureMinMagFilters_ = GL_NEAREST;
break; break;
case libcamera::formats::SGBRG8: case libcamera::formats::SGBRG8:
firstRed_.setX(0.0); firstRed_.setX(0.0);
firstRed_.setY(1.0); firstRed_.setY(1.0);
vertexShaderFile_ = ":include/libcamera/internal/shaders/bayer_8.vert"; vertexShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.vert";
fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_8.frag"; fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.frag";
textureMinMagFilters_ = GL_NEAREST; textureMinMagFilters_ = GL_NEAREST;
break; break;
case libcamera::formats::SGRBG8: case libcamera::formats::SGRBG8:
firstRed_.setX(1.0); firstRed_.setX(1.0);
firstRed_.setY(0.0); firstRed_.setY(0.0);
vertexShaderFile_ = ":include/libcamera/internal/shaders/bayer_8.vert"; vertexShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.vert";
fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_8.frag"; fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.frag";
textureMinMagFilters_ = GL_NEAREST; textureMinMagFilters_ = GL_NEAREST;
break; break;
case libcamera::formats::SRGGB8: case libcamera::formats::SRGGB8:
firstRed_.setX(0.0); firstRed_.setX(0.0);
firstRed_.setY(0.0); firstRed_.setY(0.0);
vertexShaderFile_ = ":include/libcamera/internal/shaders/bayer_8.vert"; vertexShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.vert";
fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_8.frag"; fragmentShaderFile_ = ":include/libcamera/internal/shaders/bayer_unpacked.frag";
textureMinMagFilters_ = GL_NEAREST; textureMinMagFilters_ = GL_NEAREST;
break; break;
case libcamera::formats::SBGGR10_CSI2P: case libcamera::formats::SBGGR10_CSI2P:

24
src/libcamera/software_isp/debayer_egl.cpp
View file

@ -189,10 +189,10 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm
case libcamera::formats::SGBRG8: case libcamera::formats::SGBRG8:
case libcamera::formats::SGRBG8: case libcamera::formats::SGRBG8:
case libcamera::formats::SRGGB8: case libcamera::formats::SRGGB8:
fragmentShaderData = bayer_8_frag; fragmentShaderData = bayer_unpacked_frag;
fragmentShaderDataLen = bayer_8_frag_len; fragmentShaderDataLen = bayer_unpacked_frag_len;
vertexShaderData = bayer_8_vert; vertexShaderData = bayer_unpacked_vert;
vertexShaderDataLen = bayer_8_vert_len; vertexShaderDataLen = bayer_unpacked_vert_len;
break; break;
case libcamera::formats::SBGGR10_CSI2P: case libcamera::formats::SBGGR10_CSI2P:
case libcamera::formats::SGBRG10_CSI2P: case libcamera::formats::SGBRG10_CSI2P:
@ -200,10 +200,10 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm
case libcamera::formats::SRGGB10_CSI2P: case libcamera::formats::SRGGB10_CSI2P:
egl_.pushEnv(shaderEnv, "#define RAW10P"); egl_.pushEnv(shaderEnv, "#define RAW10P");
if (BayerFormat::fromPixelFormat(inputFormat).packing == BayerFormat::Packing::None) { if (BayerFormat::fromPixelFormat(inputFormat).packing == BayerFormat::Packing::None) {
fragmentShaderData = bayer_8_frag; fragmentShaderData = bayer_unpacked_frag;
fragmentShaderDataLen = bayer_8_frag_len; fragmentShaderDataLen = bayer_unpacked_frag_len;
vertexShaderData = bayer_8_vert; vertexShaderData = bayer_unpacked_vert;
vertexShaderDataLen = bayer_8_vert_len; vertexShaderDataLen = bayer_unpacked_vert_len;
glFormat_ = GL_RG; glFormat_ = GL_RG;
bytesPerPixel_ = 2; bytesPerPixel_ = 2;
} else { } else {
@ -219,10 +219,10 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm
case libcamera::formats::SRGGB12_CSI2P: case libcamera::formats::SRGGB12_CSI2P:
egl_.pushEnv(shaderEnv, "#define RAW12P"); egl_.pushEnv(shaderEnv, "#define RAW12P");
if (BayerFormat::fromPixelFormat(inputFormat).packing == BayerFormat::Packing::None) { if (BayerFormat::fromPixelFormat(inputFormat).packing == BayerFormat::Packing::None) {
fragmentShaderData = bayer_8_frag; fragmentShaderData = bayer_unpacked_frag;
fragmentShaderDataLen = bayer_8_frag_len; fragmentShaderDataLen = bayer_unpacked_frag_len;
vertexShaderData = bayer_8_vert; vertexShaderData = bayer_unpacked_vert;
vertexShaderDataLen = bayer_8_vert_len; vertexShaderDataLen = bayer_unpacked_vert_len;
glFormat_ = GL_RG; glFormat_ = GL_RG;
bytesPerPixel_ = 2; bytesPerPixel_ = 2;
} else { } else {