From patchwork Fri Oct 30 14:21:01 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 28722 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 EE783C324C for ; Fri, 30 Oct 2026 14:21:08 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8D83969105; Fri, 30 Oct 2026 15:21:08 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="j5OGt93n"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Qf8D/xgh"; dkim-atps=neutral Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 30FCB69075 for ; Fri, 30 Oct 2026 15:21:07 +0100 (CET) Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 69UDnAIJ263333 for ; Fri, 30 Oct 2026 14:21:05 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=qcppdkim1; bh=C8JPvSiaJC2OhqWZ/Jfa84bbuDHr6/gZmtd tmmRHaGg=; b=j5OGt93niqBI11w61Tj00lCSEIV50Id5BMuCROzkXvVANMa22nm 14ftkXfL/2mD/looKhCENyczRuTTdfVnIhxaeb7bL/SbmL3v+YcjuGrMUZ21x2vg sF6cmCSkCyVXuHbureWGYokhyT9f2WJFpyq8bms307axE75VfbFUnATiraYXphQE OFfkADpYcp7ccbiytHyJAqbqvdGJLabUJNET+tmNNCZkx+xfEpjwRgVFA0nCh+74 UwjuyksuOX+eDXPKr1yHILwHojNwozQZc/XAESCkiDwPz6YQYyNoqS/PBCz+sD6b fHnVOsuHVLoG5VurIzFL9wvg7alwHBp7mIw== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4hme6rkj0m-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 30 Oct 2026 14:21:05 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-917baea8e5dso15492746d6.3 for ; Fri, 30 Oct 2026 07:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1793370064; x=1793974864; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=C8JPvSiaJC2OhqWZ/Jfa84bbuDHr6/gZmtdtmmRHaGg=; b=Qf8D/xghpv7m+sYTnT1GP5ieEnmH0Yn4bI3YMUZhv6MvUgbJFZ6AR6gKG5soLCJyTL 02HmMf3nEZA241m3oJtRllNrkXRrgYegNwjw/GNA69PfVPmDxsFSRH1Q7XX1Ldjb+QxK QnYZMwrLVXlpsM5ehqBsIXCd7q1t5hkOsR9J7/rxHw1dsrp9iy187cgH6egvN09gBXM4 20gSKPTA3agKIyJ/t4K4d78N1GCkOnNY18rYJ3L6QUtRVdK+6UbCDUFQkeIdzbDZzWTM +lOhLLqpcpGhtFddNgQndJZteO+PSG0CSLwp3imfi9XMuSpuNsrKMh+TlwjlWuMFonmb VYRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793370064; x=1793974864; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=C8JPvSiaJC2OhqWZ/Jfa84bbuDHr6/gZmtdtmmRHaGg=; b=FWSpsqVuaA9wuTFlP12P6U7aorRRaVuWBAH3mNoPQ2fAw4mrRCZ3LcL11twRghdJaZ F//R+aVxSrL8SeydvT54f2c2fKH+cgtt5l29SsDQubathysbj9xcaWOy2YmbamF93WtQ xyOCWorgyxZFYOwPoeZfVWlWZvrdcmcazbWqg0NYEwV4lOV5jeJMPN1Fg+O8RLLheRCf KVepzwRvmZNxjFb3N5W2X2BJiOrJYHxxp0/2pMiE+uYnMgbJS6m/SfE4KfiNghpQtv31 /6MtBj97oLyVulpxfN4Qtgq0pN0JahvNa3cjPYN3LAGTG8nQBalUTxnV9EYH5tEfR6y8 6iog== X-Gm-Message-State: AFq9FYJjAiWOlAN5f8x06jsWDLrEFR0/MUDRNnlnAKMufI1Ik7PQOSqb LfORwtYIOAy2pkz5WiA0i0yTCSMVb03AGj65/n+HYLZye+uJa+9tUWaKAInyPVP3YRYM1K6vxNw 70aVU/ycVMC8M9MJsJ6brLllg/tQVLYBZL7ndkvpiaTYZOPVH4pUfPYQKgJ6MG/84ocnCqOxpY1 o7GPCkTIo2 X-Gm-Gg: AYBFou17O84h79ZpWvbVmcCS228Rjd4X0YAfv/gJrImmm5E4o9bfq7tzjNG8Ps7gniK y3KzyAhPB4sZYMeFfFW8FD7J+MyZxWw7jrOOzSWhdM51iJdE1mEaxhIEU1pgnn15Ff4c0p2J2ht mLTqQsfMMS2RmEl56Mk9CEZdu/1ZvjpFvCRmY52uppOir1hyl4eJKjzoRRwIY4oYUc7JIWnfWnO RoNq9ZCXLPOSCaPt9i3KNQYuo81mkGCefXlHzIHvvVcl6ggBfe2bmRc0CCEH6ilUOG1r5w7st2N p5fkVCR7ptvSo63NIFOEkolnDLSJCzd303yLKHZb7AWYHJT7yNmNtATRYAjzGSQgXu0kf47xsJv MdWwwESEzKfjsTG8QW606kWFnkuLaXkp8GUWQoBMHcrzfQIX+rQdcsC4yZJJ9UE+JccJO7thxqN 9nrGqd858SV+IADwlmVgRdTMzMm0JErWBIjmopQ2XGTNj5QeZ9aU2pVxQfeOC696A8 X-Received: by 2002:a05:620a:444f:b0:93f:5cc0:5978 with SMTP id af79cd13be357-9442174f928mr372516885a.37.1793370063851; Fri, 30 Oct 2026 07:21:03 -0700 (PDT) X-Received: by 2002:a05:620a:444f:b0:93f:5cc0:5978 with SMTP id af79cd13be357-9442174f928mr372511285a.37.1793370063194; Fri, 30 Oct 2026 07:21:03 -0700 (PDT) Received: from shalem (2001-1c00-0c32-7800-5bfa-a036-83f0-f9ec.cable.dynamic.v6.ziggo.nl. [2001:1c00:c32:7800:5bfa:a036:83f0:f9ec]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c4cabcfdc30sm70834966b.26.2026.10.30.07.21.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Oct 2026 07:21:02 -0700 (PDT) From: Hans de Goede To: libcamera-devel@lists.libcamera.org, Kieran Bingham Cc: Hans de Goede Subject: [PATCH] qcam: viewfinder_gl: Set awb GL uniform for debayer shaders Date: Fri, 30 Oct 2026 15:21:01 +0100 Message-ID: <20261030142101.46288-1-johannes.goede@oss.qualcomm.com> X-Mailer: git-send-email 2.56.0 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: pi4ezyIcWou724OK2Zq_n27ECjFgVmdk X-Proofpoint-Spam-Info: AW1haW4tMjYxMDMwMDA1NyBTYWx0ZWRfXx1PHjOT/Bi3o io8EIoH3ByHn2H+2GcxgAri8izbHIo2+tedGUcV3qlg1HUSFxNtHXibd0reguSqR/UjnEb8sdmC f0zTCcrkYpx6yb7rdlTC5ONyqlFq59Q= X-Authority-Analysis: v=2.4 cv=PIqaavqC c=1 sm=1 tr=0 ts=6ae4a7d1 cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=xqWC_Br6kY4A:10 a=660iZSQnnn4A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=eoimf2acIAo5FJnRuUoq:22 a=EUspDBNiAAAA:8 a=4LKjs_qJrPIKv9ZeYiAA:9 a=OIgjcC2v60KrkQgK7BGD:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMDMwMDA1NyBTYWx0ZWRfX01rs/ssUbjGV txB7Gdt3ozW0MUUZew75rkNhkoEp+4YAdcMZFrsMJsbZjoKjf8dGNRWw7Z4JOcAAP7meN9awfQh NwcomiMKqtu5MBQk6AWjNNzEV1M61z0JW8i7xRMkxacmpBf9JZ1oF6vtsvylDoa3A2EHZLjUO0i aA22oGpK5kxQw6yu3AgNLLjwe1ZiNeIC9poGTaZynjOVmtMT7wZaJ10Aejd2VPRiqEfJUrvCf14 Ap6l9rRQNNmiIaYv6MjAOfRml8S2Gwpq/8bW6L3NyQ4qdWKU6yLL8LSaYJ0q4ME0Xvw+e80g5pM 9lCBwC4NkNN/Ugz0Yh4S/KghQeWlvjYIsPgPJAatQ5algnER11nkVXq56lLTKg64LnNTaI39fJt do81NTgvvUzZEUcHu6lH/j3TrNUguIDR8NzQFrJf8yRT2QX2ru6Gfe9hWbszRIlcGji41/IHA5A NcU3HohPJURsxfqwnqQ== X-Proofpoint-GUID: pi4ezyIcWou724OK2Zq_n27ECjFgVmdk X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293, Aquarius:18.0.1176, Hydra:6.1.138, FMLib:17.12.100.49 definitions=2026-10-30_04,2026-10-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 malwarescore=0 bulkscore=0 impostorscore=0 spamscore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 adultscore=0 priorityscore=1501 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2610190000 definitions=main-2610300057 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" Since commit 569e3a41e9e4 ("softisp: Split AWB from Combined Matrix") trying to use qcam's debayer shaders results in a black picture because of the awb GL uniform note getting set, which gets interpreted as all AWB gains being 0.0. Fixes: 569e3a41e9e4 ("softisp: Split AWB from Combined Matrix") Signed-off-by: Hans de Goede Reviewed-by: Kieran Bingham --- src/apps/qcam/viewfinder_gl.cpp | 7 +++++++ src/apps/qcam/viewfinder_gl.h | 3 +++ 2 files changed, 10 insertions(+) diff --git a/src/apps/qcam/viewfinder_gl.cpp b/src/apps/qcam/viewfinder_gl.cpp index 1d3f48917..fb9717ce1 100644 --- a/src/apps/qcam/viewfinder_gl.cpp +++ b/src/apps/qcam/viewfinder_gl.cpp @@ -477,6 +477,7 @@ bool ViewFinderGL::createFragmentShader() blackLevelUniformDataIn_ = shaderProgram_.uniformLocation("blacklevel"); gammaUniformDataIn_ = shaderProgram_.uniformLocation("gamma"); contrastExpUniformDataIn_ = shaderProgram_.uniformLocation("contrastExp"); + awbUniformDataIn_ = shaderProgram_.uniformLocation("awb"); /* Create the textures. */ for (std::unique_ptr &texture : textures_) { @@ -556,6 +557,9 @@ void ViewFinderGL::doRender() /* Black Level */ QVector3D qBlackLevelVec(0.0f, 0.0f, 0.0f); + /* AWB */ + QVector3D qAwbVec(1.0f, 1.0f, 1.0f); + switch (format_) { case libcamera::formats::NV12: case libcamera::formats::NV21: @@ -809,6 +813,9 @@ void ViewFinderGL::doRender() /* Black Level */ shaderProgram_.setUniformValue(blackLevelUniformDataIn_, qBlackLevelVec); + /* AWB */ + shaderProgram_.setUniformValue(awbUniformDataIn_, qAwbVec); + /* Gamma */ shaderProgram_.setUniformValue(gammaUniformDataIn_, 1.0f); diff --git a/src/apps/qcam/viewfinder_gl.h b/src/apps/qcam/viewfinder_gl.h index 1aa85e4fc..8f033b407 100644 --- a/src/apps/qcam/viewfinder_gl.h +++ b/src/apps/qcam/viewfinder_gl.h @@ -109,6 +109,9 @@ private: /* Black Level compensation */ GLint blackLevelUniformDataIn_; + /* AWB */ + GLint awbUniformDataIn_; + /* Gamma */ GLint gammaUniformDataIn_;