{"id":24648,"url":"https://patchwork.libcamera.org/api/1.1/patches/24648/?format=json","web_url":"https://patchwork.libcamera.org/patch/24648/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20251015012251.17508-4-bryan.odonoghue@linaro.org>","date":"2025-10-15T01:22:15","name":"[v3,03/39] meson: Automatically generate glsl_shaders.h from specified shader programs","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"315dfd48cde74cf55e53e006da1f91f24d8df561","submitter":{"id":175,"url":"https://patchwork.libcamera.org/api/1.1/people/175/?format=json","name":"Bryan O'Donoghue","email":"bryan.odonoghue@linaro.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/24648/mbox/","series":[{"id":5503,"url":"https://patchwork.libcamera.org/api/1.1/series/5503/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5503","date":"2025-10-15T01:22:12","name":"Add GLES 2.0 GPUISP to libcamera","version":3,"mbox":"https://patchwork.libcamera.org/series/5503/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/24648/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24648/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 66E26BF415\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 15 Oct 2025 01:23:03 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EBE246061B;\n\tWed, 15 Oct 2025 03:23:02 +0200 (CEST)","from mail-ej1-x631.google.com (mail-ej1-x631.google.com\n\t[IPv6:2a00:1450:4864:20::631])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EA68260612\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 15 Oct 2025 03:22:58 +0200 (CEST)","by mail-ej1-x631.google.com with SMTP id\n\ta640c23a62f3a-b3e7cc84b82so1125051866b.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 14 Oct 2025 18:22:58 -0700 (PDT)","from inspiron14p-linux.nxsw.local (188-141-3-146.dynamic.upc.ie.\n\t[188.141.3.146]) by smtp.gmail.com with ESMTPSA id\n\ta640c23a62f3a-b5ccd7b202dsm98348466b.82.2025.10.14.18.22.56\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 14 Oct 2025 18:22:57 -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=\"McnJEI2Q\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1760491378; x=1761096178;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=q2bD5pT1oq/3EFruAOUxznBdV/GzEfzx1ttQIm2/ez4=;\n\tb=McnJEI2QrmkAmvUxEaA5VvRkrt/iOWl4iTDV3Mr38fz4klcVMjIxX8E+92j5TEiwnH\n\tvgtFAfwSuR1TcsJQbMj/p2g6MbyVUsUhB3z2ySoU5+k0API3v5k1nU7xZtmGVsjTUcBk\n\t3JLXoCZIKql3eQcAVXKaOYRNmT3ICpjL64VNPdMcMTIX/IG994ICVpr4g+JTVw2Gv2zQ\n\tr4LRUi6hI1/h4PfqAT9YZMPE0PIUZrkQK+su5t07QiPIMEoWwPKU+I0e/Pe6APHGaXoG\n\ttj73u/wnrAl2gv5dD+8LRSLDRtTwIB6Brg1YXLz5CMQ/FPRshHec42rASKCzAZpjULST\n\twcGA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1760491378; x=1761096178;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=q2bD5pT1oq/3EFruAOUxznBdV/GzEfzx1ttQIm2/ez4=;\n\tb=KG94euhjcVHGlBPgCMQA4pZq7aByHKFBqbAR/Mid0DGhaGitghcjs8n1UjhhFXDn4y\n\tO8LA7i7+WsR7yM6zEDzDHaGAmu3BCYufcbfr2ZdDK+UMFynvElzJxpmyVjja3crsBsmk\n\tr4CbTQhM+Iv5WzMcNzuoLtPov8KyCST5TkZZfSerMqsUp/hlUJsPvEB17mt27i3Sup27\n\tAo03wgAuVmc4foTD0fKbD9yN2u/scAaEwqjPahAB8UpmBtb9YCVUrFvPB7ztT3KMKghc\n\tvU6qCXR15mex0xO3A1/5V9YE/IQj/POpeSvxXpzCtv+7MyhfpnkPqM+DrrOtpzY7/tmt\n\tgnRw==","X-Gm-Message-State":"AOJu0Ywf8ODuGbAHimL90HfujDwNCGpMiGShdN58QsbjGcg+1R8DWxNL\n\tvJjGxbdlH+vVxt6Hsn2c0m09Wpw0lijYmIugVFIViDQEdTOM5WjhhXKC0Kq8cOuXzIXfqAlyvf9\n\tRWiNz","X-Gm-Gg":"ASbGncsM+CjmJZKF+J5gZQcLWiCghTXNchTqjrSXSMoWBJMkbdN3nFXkPtoTEwnzqrI\n\tXZJ2roH94DAWynTObt9YOj3d5fjChBbW9GhSV/5Lqhk4vrb/j6igW8Mn0EU3KgEIbJuQ1BrW6vg\n\tzLhYQRM98asEo+Yl3qdFP/inByuc7sZ/eL2W9odmUsstzUhfHVcD89d0HIsVtvkV/+VjXgAbx0T\n\tGTvSY3CaqwssQ2gbEZ5f0s1TFcc5gAIQfRAi5xYd/C9zSle7GNAylwLJARJnUCgBFesJl+tHq9f\n\tiM7aeUNX7U60SBZZAi90NN2GfRngbGV87xO9h6ku1CJLQzCpjuYijMdPtLkRzbOH0Bmk1kUCIrC\n\t3qqXgMygFwTpMdrh+FkzzkXzec/C80Q1JlFb+cQhoMW+mBm7WGN1ORg3x7wRnJOXVd0khoA8/Ra\n\t30Q0nHVBaAIvXlwCR7ux4cJT1Bk0Sk58YmRhPF1Eo4","X-Google-Smtp-Source":"AGHT+IFZz5lJd6euy3TnflC5ZVAEsQhnCfBC97wYwlXekMmDxhI9I5S/w44ec74+B/bTRLXKUbJbAg==","X-Received":"by 2002:a17:907:7f93:b0:b04:b446:355 with SMTP id\n\ta640c23a62f3a-b50aca01315mr2754993666b.59.1760491377773; \n\tTue, 14 Oct 2025 18:22:57 -0700 (PDT)","From":"Bryan O'Donoghue <bryan.odonoghue@linaro.org>","To":"libcamera-devel@lists.libcamera.org","Cc":"hdegoede@redhat.com, mzamazal@redhat.com, bryan.odonoghue@linaro.org,\n\tbod.linux@nxsw.ie","Subject":"[PATCH v3 03/39] meson: Automatically generate glsl_shaders.h from\n\tspecified shader programs","Date":"Wed, 15 Oct 2025 02:22:15 +0100","Message-ID":"<20251015012251.17508-4-bryan.odonoghue@linaro.org>","X-Mailer":"git-send-email 2.51.0","In-Reply-To":"<20251015012251.17508-1-bryan.odonoghue@linaro.org>","References":"<20251015012251.17508-1-bryan.odonoghue@linaro.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"Encode the bayer shader files into a header as part of the build process.\nQcam already compiles the shader files down into a QT resource file which\nit references internally.\n\nIn order to share the debayering shader programs outside of qcam create a\ngeneric header which both qcam and libcamera can operate from.\n\nSigned-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>\n---\n include/libcamera/internal/meson.build         | 10 ++++++++++\n include/libcamera/internal/shaders/meson.build | 10 ++++++++++\n utils/meson.build                              |  2 ++\n 3 files changed, 22 insertions(+)\n create mode 100644 include/libcamera/internal/shaders/meson.build","diff":"diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\nindex 45c299f6..ecb7c9fa 100644\n--- a/include/libcamera/internal/meson.build\n+++ b/include/libcamera/internal/meson.build\n@@ -1,6 +1,7 @@\n # SPDX-License-Identifier: CC0-1.0\n \n subdir('tracepoints')\n+subdir('shaders')\n \n libcamera_internal_headers = files([\n     'bayer_format.h',\n@@ -59,5 +60,14 @@ tracepoints_h = custom_target(\n \n libcamera_internal_headers += tracepoints_h\n \n+libcamera_shader_headers = custom_target(\n+    'gen-shader-headers',\n+    input : [shader_files],\n+    output : 'glsl_shaders.h',\n+    command : [gen_shader_headers, meson.project_source_root(), meson.project_build_root(), '@OUTPUT@', '@INPUT@'],\n+)\n+\n+libcamera_internal_headers += libcamera_shader_headers\n+\n subdir('converter')\n subdir('software_isp')\ndiff --git a/include/libcamera/internal/shaders/meson.build b/include/libcamera/internal/shaders/meson.build\nnew file mode 100644\nindex 00000000..386b342d\n--- /dev/null\n+++ b/include/libcamera/internal/shaders/meson.build\n@@ -0,0 +1,10 @@\n+# SPDX-License-Identifier: CC0-1.0\n+\n+# List of shader files to convert to header hex\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+    'identity.vert',\n+])\ndiff --git a/utils/meson.build b/utils/meson.build\nindex 95d657ac..3deed8ad 100644\n--- a/utils/meson.build\n+++ b/utils/meson.build\n@@ -3,5 +3,7 @@\n subdir('codegen')\n subdir('ipu3')\n \n+gen_shader_headers = files('gen-shader-headers.sh')\n+\n ## Module signing\n gen_ipa_priv_key = files('gen-ipa-priv-key.sh')\n","prefixes":["v3","03/39"]}