From patchwork Wed Nov 18 09:57:33 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: 28988 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 0A6DBBDE17 for ; Wed, 18 Nov 2026 09:58:37 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A0E476A8FF; Wed, 18 Nov 2026 10:58:36 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="JhRGkL+J"; dkim-atps=neutral Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 11B176A8F4 for ; Wed, 18 Nov 2026 10:58:16 +0100 (CET) Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-4a5024b3c28so752348f8f.0 for ; Wed, 18 Nov 2026 01:58:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1794995895; x=1795600695; 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:content-type; bh=7AKjWY+g5ALOXEY2gV5O8weT0+WGv5bQT6WaY62CpK4=; b=JhRGkL+Jx67SxvZDck+HGQQPkgM578TGQfxxDvNDGhicOJWFlhlUJXhCqyvGLMSp6g 8xDxMjxGZuU+ehJNqGWpSUX/lwhXzPPo/lSkLBlDm3f+ht4P83NZFDwbbP/nOgIkMqwz k+ljN/Al6HVnF0MptFDYrQuhkpPbQu5xZZv4KqdZ8otq3hT7BphuuuG/31IenFG+shUQ u+/QHg7Q3VIzzPyZ1DGc04oCevmpWF3GA5ys2XrLq83CbbXLP5vT5QpMsJJqYlAB4V+1 ChyzUkHCd80efRlRptwOGD3u9OH0MnSYXfFagN5GY60IBDbJ4nH/s3MSunLI4YttjXWB V0bQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794995895; x=1795600695; 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:content-type; bh=7AKjWY+g5ALOXEY2gV5O8weT0+WGv5bQT6WaY62CpK4=; b=NP8oc87A8SzsbhIlehh5Gk1LsSV06wb/0yRKIITZhnp9ddOllUNE+4i/K3p8L1JW5j Yx1DXznrvpaQS3dhc5048n865JNO3EeD5HpdvRcRFg41MqOhq5qxDJPQOFkeIDnrxgUE EFqQcAj5nAmXwkxdLZrC2o1jXWqfJtgXRTD9b6YcC+DZ8rwAaD20JNtjVj/xcM3GWny+ SW/yg1bgt7x0HSzu0vpXqwCtcNL+Y++qVxyd1x5jAYJ0vOYSzWrVrk8m7wko7KYx+0Lq EBurHPMrudaeSGaGKfXa6tvwzZ3QDId5gPEUQZgqvwYtpFIPRk4kIToIh4DAv0hStlkh B1Mw== X-Gm-Message-State: APuU4Z/op/mERfmH3U1z3cTkLiTNmK0R+aLHhz+K3tDdXseBlJ/AxA0S xMWX/ELLPZ9hLh38Mgg0Qi76e1ATqufIITBzpz1Idz+3wHILw878Qqhv1M45jPgHWzvgFKpajoE ujgL+zS0= X-Gm-Gg: AZFdTZdwcFITIOBs2v+euUA+Jh95TOZ1HxlrnFnaVI/kEn2h+hT+KC+fvJVf2nqy3SO +3V9DHqU/KxvAvQ/+lcVCE0M2rYgOfWdSYy0SXajJ9c7TjzVWI5z5BHjMd2BOWP5nqNZFAauRso jg1y3L5ONqYUCwqLv5sPU631ynA5vO2Q2JJPOT012zZUmq+clWsDxjaT3IJQQCSi5rziFGFL+YE TzYf1EBy1wA5g2IYvJCgBkXFwPwf2OAsqZTfv2bDGZEqCeRg6GyhIPl2AXk5KY1WzC/0gpHT8WY ULo5dAkuQgQJ2LEYS44X3cNM6mbJuyzU37KFjVlKIbC3CPiaP+bOT5TAK7lpLTpMuVENQOsPv5x v0OGH4Xqt6Fa4LbAIrzs4FFUnOzXEV+4r/OFeuPZY+Jh88pWhNFVL6sjQq0t0sQcYLiNZFuCabW s8HMtdEgR8JwmF18l3HK+rdRSWI1aFRVr+UuDIP2dc3pjvwQb8qULz0i8Fl6chUP3SJLCRhuyIJ 8twOHggTLgvsnv8VrvrxqiDVJaW2uOH5+uCqvEI7k+rQ9rwxZEsgslM8hQw/cBzc5qrE/K+GpYw Vk4fByNIM9sMoxysslnTu4q9vxH4mYydiREjdivyD9JzqQ== X-Received: by 2002:a05:6000:4b0e:b0:491:c392:1f31 with SMTP id ffacd0b85a97d-4a377f4eef4mr11080139f8f.28.1794995895626; Wed, 18 Nov 2026 01:58:15 -0800 (PST) Received: from inspiron14p-linux ([109.76.187.112]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4a655f9f4a7sm3940871f8f.34.2026.11.18.01.58.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2026 01:58:15 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: rstrode@redhat.com, robert.mader@collabora.com, barnabas.pocze@ideasonboard.com, Bryan O'Donoghue Subject: [RFC PATCH v2 26/26] libcamera: software_isp: gpu_pipeline_shader_pass_demosiac: Remove unnecessary tex_step input Date: Wed, 18 Nov 2026 10:57:33 +0100 Message-ID: <20261118095735.170587-27-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261118095735.170587-1-bryan.odonoghue@linaro.org> References: <20261118095735.170587-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" The fragment shader associated with this class no longer depends on tex_step as input. Thus we can shed the supporting infrastructure feeding it. Signed-off-by: Bryan O'Donoghue --- .../software_isp/gpu_pipeline_shader_pass_demosiac.cpp | 6 ------ .../software_isp/gpu_pipeline_shader_pass_demosiac.h | 1 - 2 files changed, 7 deletions(-) diff --git a/src/libcamera/software_isp/gpu_pipeline_shader_pass_demosiac.cpp b/src/libcamera/software_isp/gpu_pipeline_shader_pass_demosiac.cpp index bceb5f68d..3232ff3f5 100644 --- a/src/libcamera/software_isp/gpu_pipeline_shader_pass_demosiac.cpp +++ b/src/libcamera/software_isp/gpu_pipeline_shader_pass_demosiac.cpp @@ -111,7 +111,6 @@ int GpuIspShaderPassDemosiac::getShaderVariableLocations(void) textureUniformBayerFirstRed_ = glGetUniformLocation(programId_, "tex_bayer_first_red"); textureUniformProjMatrix_ = glGetUniformLocation(programId_, "proj_matrix"); textureUniformBayerDataIn_ = glGetUniformLocation(programId_, "tex_y"); - textureUniformStep_ = glGetUniformLocation(programId_, "tex_step"); textureUniformSize_ = glGetUniformLocation(programId_, "tex_size"); LOG(GpuShaderDemosiac, Debug) << "vertexIn " << attributeVertex_ << " textureIn " << attributeTexture_ @@ -137,8 +136,6 @@ void GpuIspShaderPassDemosiac::setShaderVariableValues(eGLImage &eglImageIn, con GLfloat firstRed[] = { firstRed_x_, firstRed_y_ }; GLfloat imgSize[] = { (GLfloat)passInputCfg_.size.width, (GLfloat)passInputCfg_.size.height }; - GLfloat Step[] = { static_cast(bytesPerPixel_) / (passInputCfg_.stride - 1), - 1.0f / (passInputCfg_.size.height - 1) }; GLfloat Stride = (GLfloat)passInputCfg_.size.width / (shaderStridePixels_ / bytesPerPixel_); /* * Scale the output size from the native size the algorithm produces for @@ -195,7 +192,6 @@ void GpuIspShaderPassDemosiac::setShaderVariableValues(eGLImage &eglImageIn, con */ glUniform2fv(textureUniformBayerFirstRed_, 1, firstRed); glUniform2fv(textureUniformSize_, 1, imgSize); - glUniform2fv(textureUniformStep_, 1, Step); glUniform1f(textureUniformStrideFactor_, Stride); glUniformMatrix4fv(textureUniformProjMatrix_, 1, GL_FALSE, projMatrix); @@ -209,8 +205,6 @@ void GpuIspShaderPassDemosiac::setShaderVariableValues(eGLImage &eglImageIn, con << " firstRed.y " << firstRed[1] << " textureUniformSize_.width " << imgSize[0] << " textureUniformSize_.height " << imgSize[1] - << " textureUniformStep_.x " << Step[0] - << " textureUniformStep_.y " << Step[1] << " textureUniformStrideFactor_ " << Stride << " textureUniformProjMatrix_ " << textureUniformProjMatrix_; diff --git a/src/libcamera/software_isp/gpu_pipeline_shader_pass_demosiac.h b/src/libcamera/software_isp/gpu_pipeline_shader_pass_demosiac.h index 4d91254a2..0d9d02547 100644 --- a/src/libcamera/software_isp/gpu_pipeline_shader_pass_demosiac.h +++ b/src/libcamera/software_isp/gpu_pipeline_shader_pass_demosiac.h @@ -44,7 +44,6 @@ public: const char *name() const override { return "GpuIspShaderPassDemosiac"; } private: /* Shader parameters */ - GLint textureUniformStep_; GLint textureUniformSize_; /* Per-frame AWB gains */