[{"id":34449,"web_url":"https://patchwork.libcamera.org/comment/34449/","msgid":"","date":"2025-06-11T12:55:17","subject":"Re: [PATCH 34/35] libcamera: shaders: Rename bayer_8 to\n\tbayer_unpacked","submitter":{"id":175,"url":"https://patchwork.libcamera.org/api/people/175/","name":"Bryan O'Donoghue","email":"bryan.odonoghue@linaro.org"},"content":"On 11/06/2025 02:32, Bryan O'Donoghue wrote:\n> From: Milan Zamazal \n> \n> bayer_8.* shaders are now used for all unpacked sensor data formats,\n> regardless of the pixel bit width. Let's rename the \"8-bit\" shaders to\n> avoid confusion.\n> \n> Signed-off-by: Milan Zamazal \n> Signed-off-by: Bryan O'Donoghue \n> ---\n> .../{bayer_8.frag => bayer_unpacked.frag} | 0\n> .../{bayer_8.vert => bayer_unpacked.vert} | 0\n> .../libcamera/internal/shaders/meson.build | 4 ++--\n> src/apps/qcam/assets/shader/shaders.qrc | 4 ++--\n> src/apps/qcam/viewfinder_gl.cpp | 16 ++++++-------\n> src/libcamera/software_isp/debayer_egl.cpp | 24 +++++++++----------\n> 6 files changed, 24 insertions(+), 24 deletions(-)\n> rename include/libcamera/internal/shaders/{bayer_8.frag => bayer_unpacked.frag} (100%)\n> rename include/libcamera/internal/shaders/{bayer_8.vert => bayer_unpacked.vert} (100%)\n> \n> diff --git a/include/libcamera/internal/shaders/bayer_8.frag b/include/libcamera/internal/shaders/bayer_unpacked.frag\n> similarity index 100%\n> rename from include/libcamera/internal/shaders/bayer_8.frag\n> rename to include/libcamera/internal/shaders/bayer_unpacked.frag\n> diff --git a/include/libcamera/internal/shaders/bayer_8.vert b/include/libcamera/internal/shaders/bayer_unpacked.vert\n> similarity index 100%\n> rename from include/libcamera/internal/shaders/bayer_8.vert\n> rename to include/libcamera/internal/shaders/bayer_unpacked.vert\n> diff --git a/include/libcamera/internal/shaders/meson.build b/include/libcamera/internal/shaders/meson.build\n> index 386b342d..dd441a57 100644\n> --- a/include/libcamera/internal/shaders/meson.build\n> +++ b/include/libcamera/internal/shaders/meson.build\n> @@ -4,7 +4,7 @@\n> # for the purposes of inclusion in OpenGL debayering\n> shader_files = files([\n> 'bayer_1x_packed.frag',\n> - 'bayer_8.frag',\n> - 'bayer_8.vert',\n> + 'bayer_unpacked.frag',\n> + 'bayer_unpacked.vert',\n> 'identity.vert',\n> ])\n> diff --git a/src/apps/qcam/assets/shader/shaders.qrc b/src/apps/qcam/assets/shader/shaders.qrc\n> index 04f9d706..32dfa51b 100644\n> --- a/src/apps/qcam/assets/shader/shaders.qrc\n> +++ b/src/apps/qcam/assets/shader/shaders.qrc\n> @@ -6,8 +6,8 @@\n> \t../../../../../include/libcamera/internal/shaders/YUV_3_planes.frag\n> \t../../../../../include/libcamera/internal/shaders/YUV_packed.frag\n> \t../../../../../include/libcamera/internal/shaders/bayer_1x_packed.frag\n> -\t../../../../../include/libcamera/internal/shaders/bayer_8.frag\n> -\t../../../../../include/libcamera/internal/shaders/bayer_8.vert\n> +\t../../../../../include/libcamera/internal/shaders/bayer_unpacked.frag\n> +\t../../../../../include/libcamera/internal/shaders/bayer_unpacked.vert\n> \t../../../../../include/libcamera/internal/shaders/identity.vert\n> \n> \n> diff --git a/src/apps/qcam/viewfinder_gl.cpp b/src/apps/qcam/viewfinder_gl.cpp\n> index 70f60065..95965ab7 100644\n> --- a/src/apps/qcam/viewfinder_gl.cpp\n> +++ b/src/apps/qcam/viewfinder_gl.cpp\n> @@ -235,29 +235,29 @@ bool ViewFinderGL::selectFormat(const libcamera::PixelFormat &format)\n> \tcase libcamera::formats::SBGGR8:\n> \t\tfirstRed_.setX(1.0);\n> \t\tfirstRed_.setY(1.0);\n> -\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.vert\";\n> -\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.frag\";\n> +\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.vert\";\n> +\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.frag\";\n> \t\ttextureMinMagFilters_ = GL_NEAREST;\n> \t\tbreak;\n> \tcase libcamera::formats::SGBRG8:\n> \t\tfirstRed_.setX(0.0);\n> \t\tfirstRed_.setY(1.0);\n> -\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.vert\";\n> -\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.frag\";\n> +\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.vert\";\n> +\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.frag\";\n> \t\ttextureMinMagFilters_ = GL_NEAREST;\n> \t\tbreak;\n> \tcase libcamera::formats::SGRBG8:\n> \t\tfirstRed_.setX(1.0);\n> \t\tfirstRed_.setY(0.0);\n> -\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.vert\";\n> -\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.frag\";\n> +\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.vert\";\n> +\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.frag\";\n> \t\ttextureMinMagFilters_ = GL_NEAREST;\n> \t\tbreak;\n> \tcase libcamera::formats::SRGGB8:\n> \t\tfirstRed_.setX(0.0);\n> \t\tfirstRed_.setY(0.0);\n> -\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.vert\";\n> -\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_8.frag\";\n> +\t\tvertexShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.vert\";\n> +\t\tfragmentShaderFile_ = \":include/libcamera/internal/shaders/bayer_unpacked.frag\";\n> \t\ttextureMinMagFilters_ = GL_NEAREST;\n> \t\tbreak;\n> \tcase libcamera::formats::SBGGR10_CSI2P:\n> diff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp\n> index 71742d84..9ec96660 100644\n> --- a/src/libcamera/software_isp/debayer_egl.cpp\n> +++ b/src/libcamera/software_isp/debayer_egl.cpp\n> @@ -189,10 +189,10 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm\n> \tcase libcamera::formats::SGBRG8:\n> \tcase libcamera::formats::SGRBG8:\n> \tcase libcamera::formats::SRGGB8:\n> -\t\tfragmentShaderData = bayer_8_frag;\n> -\t\tfragmentShaderDataLen = bayer_8_frag_len;\n> -\t\tvertexShaderData = bayer_8_vert;\n> -\t\tvertexShaderDataLen = bayer_8_vert_len;\n> +\t\tfragmentShaderData = bayer_unpacked_frag;\n> +\t\tfragmentShaderDataLen = bayer_unpacked_frag_len;\n> +\t\tvertexShaderData = bayer_unpacked_vert;\n> +\t\tvertexShaderDataLen = bayer_unpacked_vert_len;\n> \t\tbreak;\n> \tcase libcamera::formats::SBGGR10_CSI2P:\n> \tcase libcamera::formats::SGBRG10_CSI2P:\n> @@ -200,10 +200,10 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm\n> \tcase libcamera::formats::SRGGB10_CSI2P:\n> \t\tegl_.pushEnv(shaderEnv, \"#define RAW10P\");\n> \t\tif (BayerFormat::fromPixelFormat(inputFormat).packing == BayerFormat::Packing::None) {\n> -\t\t\tfragmentShaderData = bayer_8_frag;\n> -\t\t\tfragmentShaderDataLen = bayer_8_frag_len;\n> -\t\t\tvertexShaderData = bayer_8_vert;\n> -\t\t\tvertexShaderDataLen = bayer_8_vert_len;\n> +\t\t\tfragmentShaderData = bayer_unpacked_frag;\n> +\t\t\tfragmentShaderDataLen = bayer_unpacked_frag_len;\n> +\t\t\tvertexShaderData = bayer_unpacked_vert;\n> +\t\t\tvertexShaderDataLen = bayer_unpacked_vert_len;\n> \t\t\tglFormat_ = GL_RG;\n> \t\t\tbytesPerPixel_ = 2;\n> \t\t} else {\n> @@ -219,10 +219,10 @@ int DebayerEGL::initBayerShaders(PixelFormat inputFormat, PixelFormat outputForm\n> \tcase libcamera::formats::SRGGB12_CSI2P:\n> \t\tegl_.pushEnv(shaderEnv, \"#define RAW12P\");\n> \t\tif (BayerFormat::fromPixelFormat(inputFormat).packing == BayerFormat::Packing::None) {\n> -\t\t\tfragmentShaderData = bayer_8_frag;\n> -\t\t\tfragmentShaderDataLen = bayer_8_frag_len;\n> -\t\t\tvertexShaderData = bayer_8_vert;\n> -\t\t\tvertexShaderDataLen = bayer_8_vert_len;\n> +\t\t\tfragmentShaderData = bayer_unpacked_frag;\n> +\t\t\tfragmentShaderDataLen = bayer_unpacked_frag_len;\n> +\t\t\tvertexShaderData = bayer_unpacked_vert;\n> +\t\t\tvertexShaderDataLen = bayer_unpacked_vert_len;\n> \t\t\tglFormat_ = GL_RG;\n> \t\t\tbytesPerPixel_ = 2;\n> \t\t} else {\nReviewed-by: Bryan O'Donoghue ","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 33342BDE6B\n\tfor ;\n\tWed, 11 Jun 2025 12:55:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DC51A68DC2;\n\tWed, 11 Jun 2025 14:55:21 +0200 (CEST)","from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com\n\t[IPv6:2a00:1450:4864:20::32e])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DF85D61552\n\tfor ;\n\tWed, 11 Jun 2025 14:55:19 +0200 (CEST)","by mail-wm1-x32e.google.com with SMTP id\n\t5b1f17b1804b1-442f4a3a4d6so5162975e9.0\n\tfor ;\n\tWed, 11 Jun 2025 05:55:19 -0700 (PDT)","from [192.168.0.35] (188-141-3-146.dynamic.upc.ie. [188.141.3.146])\n\tby smtp.gmail.com with ESMTPSA id\n\tffacd0b85a97d-3a53244f4e7sm15235829f8f.77.2025.06.11.05.55.18\n\t(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);\n\tWed, 11 Jun 2025 05:55:18 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"zr/XsnaE\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1749646519; x=1750251319;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:in-reply-to:from:content-language\n\t:references:cc:to:subject:user-agent:mime-version:date:message-id\n\t:from:to:cc:subject:date:message-id:reply-to;\n\tbh=ZKR/tISJElDMpwiAUCOFTbY4KCoavTWNBG+U15WRQrw=;\n\tb=zr/XsnaE8DnaAv0n96GAMfi+UsRuhNW6/8bwwcAE48gIV98RAnoehO4EBGG8fl6NoK\n\tz7FrJX7Kb2OjA9nPVv559D1zmjIGJDr8bCKfSg5C+UBxTUywS8KJmw7jfd6l6UsmwLcu\n\tEaxMu9hWA5B+dfiSjNCZLP8FYR2QK5zbkczR47k2fhd1puCtljoz9LSWAz+n0PyBDb4m\n\tqa5pxAz5O0F0otfQumhODjOlu/tH1xhsNrO1BwIVd06FaJ3tvaMALUl8yy+7BtUEz3Ql\n\toMqrzxDqeiAoaCVlbh09J0vADNJArZEon9ITUiqa7wamVZHMFXEFlpIOXEj6U8XrQK+E\n\tHQdQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1749646519; x=1750251319;\n\th=content-transfer-encoding:in-reply-to:from:content-language\n\t:references:cc:to:subject:user-agent:mime-version:date:message-id\n\t:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;\n\tbh=ZKR/tISJElDMpwiAUCOFTbY4KCoavTWNBG+U15WRQrw=;\n\tb=qpfzncrBlRqRVN5+v9oV+uEwdOaMQzJ1TrhU4XeBEiz9fVqnep3WtOY/SZ/hPMiXjv\n\tgO1Af9VoIUjp7zKTylKNFWXFsOIYrnjDVrZ4qYWxeFMgGHGIBWzir2545a5KPoeJljYD\n\tLnhltF8WEVkEL0sFqCLC56ahDSl8VU1AQ9E50zi63nzM4wjTVjHrfUp+bPzzB5qSl0f7\n\twSC+/Ds4idad+amF9ROxHYA4AL8u3B+NvxEAKU/A8AjWb9isjtN1Tsfm1m16VuSfK1dX\n\to3N4rB5kX2lxYxkh05t5vOoLPDJgEbWmfMS2noDPQ6sjrw2y/j2JTz80H7pTJEeYNuBy\n\t76pQ==","X-Gm-Message-State":"AOJu0YzyRGtmmDORXx3J/jBbYCRyYTJdPrbYWdUzCSRKjhIhGl3VL4za\n\tc7F7ydo6yIa8SRDicyCA8cxHphGq8XO+AUT25M0XnCvGREXlUyxnV+0UWk7II4XJvdUnw2CqvtV\n\tKUOcvO+0=","X-Gm-Gg":"ASbGnctYuT7VQ4AnTLKt62XX6UhrlFR8q3jdHAcZ38t3nc1GkefKX5s2TMrT7iGAAo1\n\txu64AX2YiAJIwY3vxBmMFLJHRCE/VU69eFKaKQEep7We6V43j2rYwAuXACfbXJwDN63IN6Qvogi\n\tFSy3f4F/YUKGPsVSyQu1G3kH8CktYOT5m3mEIjKQrN+HT7a283wl75pRem+1gByUPy3xOOJJKp/\n\tXpUpfBUAHWCxHZ2iVzX9QDos578tgSq/JcRLHQHuIGaQClqKP0t1CbFUipAjyR9yxE1YqpgwoJ4\n\tGbQPbHE2sunqCHGENPGaJPnj38hCn/db99woDgjVmIEM3B1MhDhJHbps9dK/XWCVmFkDpTvDVy+\n\tjRMO5+C3+xboLj14ezRepCL7LgHo=","X-Google-Smtp-Source":"AGHT+IHwLuMDYpJJ6w9MPEnH61jj6Ez003wBh1eYikaP3tkw0nkOEE5VVgAEpjptD/YfpL2r+jt6sA==","X-Received":"by 2002:a05:600c:5754:b0:43d:5264:3cf0 with SMTP id\n\t5b1f17b1804b1-453241fbcbemr22861215e9.11.1749646519221; \n\tWed, 11 Jun 2025 05:55:19 -0700 (PDT)","Message-ID":"","Date":"Wed, 11 Jun 2025 13:55:17 +0100","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH 34/35] libcamera: shaders: Rename bayer_8 to\n\tbayer_unpacked","To":"libcamera-devel@lists.libcamera.org","Cc":"Milan Zamazal ","References":"<20250611013245.133785-1-bryan.odonoghue@linaro.org>\n\t<20250611013245.133785-35-bryan.odonoghue@linaro.org>","Content-Language":"en-US","From":"Bryan O'Donoghue ","In-Reply-To":"<20250611013245.133785-35-bryan.odonoghue@linaro.org>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"7bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]