From patchwork Sat Aug 29 09:41:04 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Robert Mader X-Patchwork-Id: 28145 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 74A8AC333E for ; Sat, 29 Aug 2026 09:41:41 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 87357684AD; Sat, 29 Aug 2026 11:41:40 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=collabora.com header.i=robert.mader@collabora.com header.b="FCeoRbce"; dkim-atps=neutral Received: from sender4-op-o11.zoho.com (sender4-op-o11.zoho.com [136.143.188.11]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DD16B68450 for ; Sat, 29 Aug 2026 11:41:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; t=1787996494; cv=none; d=zohomail.com; s=zohoarc; b=lMwvl06pHQ/Xgzq1psfk+oZhLIEv8n45C+YwZkAHVvnxJlj4ga6RyahAj7LhT/rodYaSnDZ0XCmKTjBJEQDgqhLkz8RS5abnw3uzC71vAJzlponkK2JIJwibHiGTLBvJU8X7GDACX66dCXXY7FOGnZNCGRt/kQV1/kLySyviBbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1787996494; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=HgmpZzPBOcNzs2jAXXmn2HyJOYOQ4gDIG7OdmWyXR1M=; b=FwVVfM/MttqNy/8nc66LwCXhsqSMGxAFKbhvQI49BmCtvPC9LifxdZcF4whIOvsr3Cdax48vKZ3fmoUI3MrWt2WmC3kzEokbIZdrwKTK7AQyvcNMwiZy7GK+0u4U7xPNUg6rWJN54y1OCAwU3T2Ys4GMgbsOTJr2H+6U6z5GwE4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=robert.mader@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1787996494; s=zohomail; d=collabora.com; i=robert.mader@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=HgmpZzPBOcNzs2jAXXmn2HyJOYOQ4gDIG7OdmWyXR1M=; b=FCeoRbcesse+uT2b1d0/b5qLCVr2BtFh0YEG6AeTovSAoGPEWijBG8Zfj5o2SM6L bDSNdEkUKcvv201J9TiCaUn+vyiJkqFyBxXnpUCWjBtptmbJUEtymsVUArkKjJYICW9 wl9kW6C2Urk7hpJWWdkkS/doKN58gVw5u00IuNls= Received: by mx.zohomail.com with SMTPS id 1787996492768465.19994862103806; Sat, 29 Aug 2026 02:41:32 -0700 (PDT) From: Robert Mader To: libcamera-devel@lists.libcamera.org Cc: Robert Mader Subject: [PATCH] debayer_egl: Use untransposed matrix to fix GLES 2.0 Date: Sat, 29 Aug 2026 11:41:04 +0200 Message-ID: <20260829094104.191433-1-robert.mader@collabora.com> X-Mailer: git-send-email 2.55.0 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" The softISP curently fails on Mali-400 on Mesa. It turns out that transposed matrices are not allowed by the spec: > The UniformMatrix{234}fv commands will load count 2 × 2, 3 × 3, or 4 × 4 > matrices (corresponding to 2, 3, or 4 in the command name) of floating-point values > into a uniform location defined as a matrix or an array of matrices. The matrix is > specified in column-major order. transpose must be FALSE. Thus partially revert the commit mentioned below. Fixes: d780e285b593 ("shaders: bayer: Use native matrix multiplication") Signed-off-by: Robert Mader --- src/libcamera/software_isp/debayer_egl.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp index 97aa03793574..0d32cfab32aa 100644 --- a/src/libcamera/software_isp/debayer_egl.cpp +++ b/src/libcamera/software_isp/debayer_egl.cpp @@ -461,7 +461,18 @@ void DebayerEGL::setShaderVariableValues(eGLImage &eglImageIn, const DebayerPara << " textureUniformStrideFactor_ " << Stride << " textureUniformProjMatrix_ " << textureUniformProjMatrix_; - glUniformMatrix3fv(ccmUniformDataIn_, 1, GL_TRUE, params.combinedMatrix.data().data()); + GLfloat ccm[9] = { + params.combinedMatrix[0][0], + params.combinedMatrix[0][1], + params.combinedMatrix[0][2], + params.combinedMatrix[1][0], + params.combinedMatrix[1][1], + params.combinedMatrix[1][2], + params.combinedMatrix[2][0], + params.combinedMatrix[2][1], + params.combinedMatrix[2][2], + }; + glUniformMatrix3fv(ccmUniformDataIn_, 1, GL_FALSE, ccm); LOG(Debayer, Debug) << " ccmUniformDataIn_ " << ccmUniformDataIn_ << " data " << params.combinedMatrix; /*