From patchwork Tue Jan 6 17:00:40 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 25659 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 8A3EDC3213 for ; Tue, 6 Jan 2026 17:01:15 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 32A0F6200B; Tue, 6 Jan 2026 18:01:15 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="WW73P4nU"; dkim-atps=neutral Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6A29861FD2 for ; Tue, 6 Jan 2026 18:01:11 +0100 (CET) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-42b3d7c1321so696795f8f.3 for ; Tue, 06 Jan 2026 09:01:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1767718871; x=1768323671; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dsnpPU/LrCFQHtN8Cq9/x2B3nNAbe5b+r69TX5DJM4Y=; b=WW73P4nUYU2db9m2ELM//PFdK6PNDUb3tUyuSq38E0oCL0BuMMfFBmU/ph1TMh89TU 37bpCmPP/dPgwg1M6a/QVyzhEnt/MDbnVHrKDHMCd+aMJ5Jp87DvxzN8VQYkBRGzBaAS MVwgFUj+TOcdwUNunGHejwkUG7grmzBDs+7Ystnw47bI+99C7jA3OemWo0llDM8rZIMX dhgn5uRpXTZjBhduaLUz0VsoMI9HfbvUWOpeIKB05N2JkFU5DJwQYROpmEg1BHzoNiNK xQ/k90l3FwcXQG/keTYh02gjv/4qT7WcOxJudNNpeLkPctvgPGKLfOWwRa6cLgNs/HFA B6jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767718871; x=1768323671; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=dsnpPU/LrCFQHtN8Cq9/x2B3nNAbe5b+r69TX5DJM4Y=; b=IQ4VCymwAksiRfV9QDnO5Fq1vHr8DRJZSrTduf3YJc+knEmqkCQQzmH23RRF4x0iot R9LknSHHRCpI2vrbvAIB73cfFxP6PQG9bjLwWEleP8jrVSlDLqdVlvMXU+NxkeGmlGX8 wvMb7HObfJ08IGunFmSXZ8PN7YBmgA/i6eRB/iYQvqpE3khTYADqG8IBoXl+T8vFDoHk h1qHG3BOiZOe+BkRDKu+YQ8umFmd9rk8p936nSM1h9+/vYryPTS1WAkUl8DmX/wuOxYA M3rFKp4Vytzb6+cYPQVlcxip41DoLJ7whK/Wn5DOu/wrYYpQwy0owZYIq8CoAzUCqTE4 Vf6g== X-Gm-Message-State: AOJu0YxvSWc0Lv9kXadzZ2LDmk2jvEJJzm+TvhNkXuM3MnheTsyi1dHA BuLbDssB9xKwnkmQB60tg3E7M/hpsY/9bvPFgFy4KaRehWZ6u7t/Y7KaWY+LvF/QHi12m14tMvl EsD0YY5s= X-Gm-Gg: AY/fxX4mFL1ftvuIueZaQT0qO8/CKjkaIzTkrfrMf5Z0Bs7IZD69fVXyXkEhi5TKVdh F6TaPwuAwSl5uUg84eL4b7Owlz+hTRMa++cqUeDT84jxUpaUi1Yh/5mjDv0EHJyApt4gwbWxnAQ 0reO0cHwBPpfcwcyGXR0l9QgETpCBFOtFSeQm0Wi+Uol96aLkvtx/FtS6RMD/AxfnxJvY2XNpYT lGSxUj6Ii7ewYSku07tPqI0kdwfAccHHJDnrHuJjI9ZhJuCMQhKEfaroveugh2+dX1oj2X1GFov l1remnnTW0rDuyqP6FoharP3YN9lwXumi+nSTDLxSJTsRmXvuWSkRj3t5Rcm3OnaZetIi41LArH MgbQzoH1d8g82DHfKdhIfmn70XLj6yH7bu/HOiZTh3Y0ttxQh6rG2+1MXtZ6E58d37b0P19gzBj a8oaLj19WzyA8Fa/Xv5xsH0Ys9OcD2Tj3goyG78TyGAYlYndWBRvU4F4CsRhjpqKnlVpE= X-Google-Smtp-Source: AGHT+IEkCiNe5TJa+bkQk6UUXwXrfVz/J+QVkfoecD2ildZitOsx8dYn1yWY7y+JURWbufuGvH+U0g== X-Received: by 2002:a05:6000:220f:b0:430:f5ed:83f3 with SMTP id ffacd0b85a97d-432bc9cc8a6mr4321999f8f.9.1767718868978; Tue, 06 Jan 2026 09:01:08 -0800 (PST) Received: from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-432bd0dadcfsm5515322f8f.3.2026.01.06.09.01.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jan 2026 09:01:08 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Milan Zamazal , Kieran Bingham , Bryan O'Donoghue Subject: [PATCH v11 05/24] libcamera: shaders: Rename bayer_8 to bayer_unpacked Date: Tue, 6 Jan 2026 17:00:40 +0000 Message-ID: <20260106170059.56193-6-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260106170059.56193-1-bryan.odonoghue@linaro.org> References: <20260106170059.56193-1-bryan.odonoghue@linaro.org> MIME-Version: 1.0 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" From: Milan Zamazal 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 Reviewed-by: Kieran Bingham Signed-off-by: Bryan O'Donoghue --- 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 7369cdbe8..f11a68ef2 100644 --- a/src/apps/qcam/assets/shader/shaders.qrc +++ b/src/apps/qcam/assets/shader/shaders.qrc @@ -6,8 +6,8 @@ ../../../../../src/libcamera/shaders/YUV_3_planes.frag ../../../../../src/libcamera/shaders/YUV_packed.frag ../../../../../src/libcamera/shaders/bayer_1x_packed.frag - ../../../../../src/libcamera/shaders/bayer_8.frag - ../../../../../src/libcamera/shaders/bayer_8.vert + ../../../../../src/libcamera/shaders/bayer_unpacked.frag + ../../../../../src/libcamera/shaders/bayer_unpacked.vert ../../../../../src/libcamera/shaders/identity.vert diff --git a/src/apps/qcam/viewfinder_gl.cpp b/src/apps/qcam/viewfinder_gl.cpp index 0d06122f6..1d3f48917 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 386b342d0..dd441a577 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', ])