{"id":27143,"url":"https://patchwork.libcamera.org/api/1.1/patches/27143/?format=json","web_url":"https://patchwork.libcamera.org/patch/27143/","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":"<20260630125214.3327516-2-laurent.pinchart@ideasonboard.com>","date":"2026-06-30T12:52:10","name":"[v2,1/5] libcamera: shaders: Move header generation to shaders directory","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"8e5cda7fb709d7989d9e7b4162ff4d5ea13dc224","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/27143/mbox/","series":[{"id":6029,"url":"https://patchwork.libcamera.org/api/1.1/series/6029/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=6029","date":"2026-06-30T12:52:09","name":"libcamera: Improve shader header generation","version":2,"mbox":"https://patchwork.libcamera.org/series/6029/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/27143/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/27143/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 A4E1AC3261\n\tfor ;\n\tTue, 30 Jun 2026 12:52:20 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 50EFC65F82;\n\tTue, 30 Jun 2026 14:52:20 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A814665F66\n\tfor ;\n\tTue, 30 Jun 2026 14:52:16 +0200 (CEST)","from killaraus.ideasonboard.com\n\t(2001-14ba-70f3-e800--a06.rev.dnainternet.fi\n\t[IPv6:2001:14ba:70f3:e800::a06])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id BCD17104C;\n\tTue, 30 Jun 2026 14:51:32 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"WAIbcj6W\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1782823892;\n\tbh=DzvDhBfHlKd+OkJwMWghkGqkyc2Jlr4n7jaXslgePbk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=WAIbcj6WVgyTJ5Bz7MMNiXFh4z3klOOEKjL/hf9aioIKQqJ/g9ecteLf6/t4PZ7hd\n\t4WhZTCIsFZuoXPi9waowC4m4MarhTMSi63h0RRtq4MUNFLxO8AGwEAqSZzrKtH9npS\n\twuZbPceFkhYOuRC0e7y8bJtdkTQjG0nkmc03IHf4=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Cc":"Bryan O'Donoghue ","Subject":"[PATCH v2 1/5] libcamera: shaders: Move header generation to shaders\n\tdirectory","Date":"Tue, 30 Jun 2026 15:52:10 +0300","Message-ID":"<20260630125214.3327516-2-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.54.0","In-Reply-To":"<20260630125214.3327516-1-laurent.pinchart@ideasonboard.com>","References":"<20260630125214.3327516-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","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":"The src/libcamera/shaders/ directory contains all libcamera shaders for\nthe software ISP. Move the related build logic to convert shaders to\nheaders to the same directory to make shaders self-contained.\n\nThis changes the location of the glsl_shaders.h header, update\ndebayer_egl.cpp accordingly.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Milan Zamazal \nReviewed-by: Barnabás Pőcze \n---\n src/libcamera/meson.build | 10 ----------\n src/libcamera/shaders/meson.build | 10 ++++++++++\n src/libcamera/software_isp/debayer_egl.cpp | 2 +-\n 3 files changed, 11 insertions(+), 11 deletions(-)","diff":"diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 6aedacbdb04d..17c1b2cb3479 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -184,16 +184,6 @@ libcamera_deps += [\n libyaml,\n ]\n \n-# Generate headers from shaders\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(), '@OUTPUT@', '@INPUT@'],\n-)\n-\n-libcamera_internal_headers += libcamera_shader_headers\n-\n # We add '/' to the build_rpath as a 'safe' path to act as a boolean flag.\n # The build_rpath is stripped at install time by meson, so we determine at\n # runtime if the library is running from an installed location by checking\ndiff --git a/src/libcamera/shaders/meson.build b/src/libcamera/shaders/meson.build\nindex dd441a577670..adac77327a3b 100644\n--- a/src/libcamera/shaders/meson.build\n+++ b/src/libcamera/shaders/meson.build\n@@ -8,3 +8,13 @@ shader_files = files([\n 'bayer_unpacked.vert',\n 'identity.vert',\n ])\n+\n+# Generate headers from shaders\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(), '@OUTPUT@', '@INPUT@'],\n+)\n+\n+libcamera_internal_headers += libcamera_shader_headers\ndiff --git a/src/libcamera/software_isp/debayer_egl.cpp b/src/libcamera/software_isp/debayer_egl.cpp\nindex 0ec2a98cfafb..af9b9d426920 100644\n--- a/src/libcamera/software_isp/debayer_egl.cpp\n+++ b/src/libcamera/software_isp/debayer_egl.cpp\n@@ -24,7 +24,7 @@\n #include \"libcamera/internal/formats.h\"\n #include \"libcamera/internal/framebuffer.h\"\n \n-#include \"../glsl_shaders.h\"\n+#include \"../shaders/glsl_shaders.h\"\n \n namespace libcamera {\n \n","prefixes":["v2","1/5"]}