{"id":23239,"url":"https://patchwork.libcamera.org/api/patches/23239/?format=json","web_url":"https://patchwork.libcamera.org/patch/23239/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20250422215920.4297-27-bryan.odonoghue@linaro.org>","date":"2025-04-22T21:59:19","name":"[26/27] meson: Automatically generate glsl_shaders.h from specified shader programs","commit_ref":null,"pull_url":null,"state":"rfc","archived":false,"hash":"315dfd48cde74cf55e53e006da1f91f24d8df561","submitter":{"id":175,"url":"https://patchwork.libcamera.org/api/people/175/?format=json","name":"Bryan O'Donoghue","email":"bryan.odonoghue@linaro.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23239/mbox/","series":[{"id":5142,"url":"https://patchwork.libcamera.org/api/series/5142/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5142","date":"2025-04-22T21:58:53","name":"RFC: Add in a eGL based GPUISP in libcamera","version":1,"mbox":"https://patchwork.libcamera.org/series/5142/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23239/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23239/checks/","tags":{},"headers":{"Return-Path":"","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 08ED8C327D\n\tfor ;\n\tTue, 22 Apr 2025 22:00:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7AC7468B3A;\n\tWed, 23 Apr 2025 00:00:15 +0200 (CEST)","from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com\n\t[IPv6:2a00:1450:4864:20::42f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8EE4A68B41\n\tfor ;\n\tTue, 22 Apr 2025 23:59:48 +0200 (CEST)","by mail-wr1-x42f.google.com with SMTP id\n\tffacd0b85a97d-391342fc0b5so4703318f8f.3\n\tfor ;\n\tTue, 22 Apr 2025 14:59:48 -0700 (PDT)","from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie.\n\t[188.141.3.146]) by smtp.gmail.com with ESMTPSA id\n\t5b1f17b1804b1-44092d2eccesm2726615e9.20.2025.04.22.14.59.47\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 22 Apr 2025 14:59:47 -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=\"TlpT8OvI\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=linaro.org; s=google; t=1745359188; x=1745963988;\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=fTSmECeJyXTca49Z/7YULmR0N2gCFQELi3K5iShO2Yo=;\n\tb=TlpT8OvIpS1p85iosstRq1FXW0cCTTe0EyfEGrYygC7HrFq4iSVPqavMIT3KAZsquh\n\tjESaex90DIzw9ZoHvpZ+0K05ED1buX6f9f6Kut6vwFT9UA9MvYvlo4qZEtb69csaM+04\n\tUCEckb8oEAqrcu0QtozJAgPLSgTtpeqlh80MsGacylhRe3tmbD2BqgqenWFz11Gx7YEs\n\tBw+EMjZ7qq2bxgVfbed9kgcvuOk4sRifc/VT2mf0kEyM+M5q0CZXhkXTb3b7Tcj3KxB9\n\th+AEu+xurP5yNUfCjQXrFTjfHq/D2BAqtmr49gKVse8ufE/kwtGaMCx8zy+20opYCUs3\n\t+ahA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1745359188; x=1745963988;\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=fTSmECeJyXTca49Z/7YULmR0N2gCFQELi3K5iShO2Yo=;\n\tb=ElFcwzPVmIjZ4+O1zLIiiJOckDOPCjDse2qvxwXl3HIzX8O3NMAnstmdMZT5FrkcVr\n\t5fAj8nhSzmaw+Vye2ApQO4d+IHtB3iFVc7J94NmhFEBdmF01QQDDJKww9fibBVPJk9dq\n\tCBVxONZ0hDQcdIfU05EdC9QNmGbSU/p4JN2+E4eJ/K137+g6lvFGINbSDPcTnxFLaLn0\n\tZUxV75k8LEklRqHecFokHWbb7BzKy8hyZN3UkmYsm+fR2jLheqGc0CHaS34Zce7NGO6h\n\tSJCjFrRl8VkiAt8+ogA0f+lLohgzRJOVcLrZW+ENxC3Uy8MGu7tVERm5wXk8rOp50BVJ\n\trLDg==","X-Gm-Message-State":"AOJu0YynMk620/lDZzFOnKBCwVAshtjeNY1e3byv1iqmsX+TSquoUllZ\n\tvzMmuhp7CYra5e2qi5GSpzidQlIc6ANi2d20fgQFnEB89QSorYR9x0edw1jxE8zwAn0KhMhaIdg\n\t6E7Q=","X-Gm-Gg":"ASbGnctu5gYbaGm+zS4+BBBM3QMa+lxmSq71vMBoSd28VI9Jsx1egIYcQKLJteMtRGf\n\t103DftfoO7bNrji/iWthGn/4bHMobIO5u3eIs57d0BCQXjKeva8eZsIgC79U+D9Nxgh2RvTVYmD\n\tYebSy4Lc7S6vkebEbSNBSJ3hhiE5dRu5C1cd8nHNh3p7qTFhqRpEqMGaxIthiMd/qb99FuDwGH1\n\tpdci8Ksp3jSu7lypW8ArKrsBuEVsYUWrk2JAShfdvHQRgx/9EMi/JsfPHf6ZeSuxoUiNA4TPdcu\n\tQ8Ptk+GyqNELWeBlCVY7DbjeadEpTXWwEPmj0/xThXluepe1tsAbqKVfEmxJ+CXaXECwWuP0XWF\n\t5GXMN+ZOK4FyhTtVnffko","X-Google-Smtp-Source":"AGHT+IElAOSpZGrmqvFgKwbc4mb+TviYAr/wclm4q+D+YVXyf2yM7qm2W2esvxyYkGFrZ1prh0PvNw==","X-Received":"by 2002:a5d:64ae:0:b0:390:e7c1:59c4 with SMTP id\n\tffacd0b85a97d-39efba50a80mr14943572f8f.13.1745359187945; \n\tTue, 22 Apr 2025 14:59:47 -0700 (PDT)","From":"Bryan O'Donoghue ","To":"libcamera-devel@lists.libcamera.org","Cc":"hdegoede@redhat.com, mzamazal@redhat.com, bryan.odonoghue@linaro.org,\n\tbod.linux@nxsw.ie","Subject":"[PATCH 26/27] meson: Automatically generate glsl_shaders.h from\n\tspecified shader programs","Date":"Tue, 22 Apr 2025 22:59:19 +0100","Message-ID":"<20250422215920.4297-27-bryan.odonoghue@linaro.org>","X-Mailer":"git-send-email 2.49.0","In-Reply-To":"<20250422215920.4297-1-bryan.odonoghue@linaro.org>","References":"<20250422215920.4297-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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"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 \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 45408b31..10cd4930 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@@ -56,5 +57,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":["26/27"]}