From patchwork Thu Dec 12 12:51:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1208433 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ksdp0Gvp"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47YYwr2P6pz9s4Y for ; Fri, 13 Dec 2019 00:07:08 +1100 (AEDT) Received: from localhost ([::1]:59020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifOBN-0001q7-Kv for incoming@patchwork.ozlabs.org; Thu, 12 Dec 2019 08:07:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60328) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifNyD-0003Fe-KG for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifNyC-0006QK-9G for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:29 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:45876) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifNyC-0006Oo-1m for qemu-devel@nongnu.org; Thu, 12 Dec 2019 07:53:28 -0500 Received: by mail-wr1-x434.google.com with SMTP id j42so2572706wrj.12 for ; Thu, 12 Dec 2019 04:53:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=g4zEzo5NcSs7ChSRMHLU2CYO2jCxB5nfA8k+ievYaHo=; b=Ksdp0GvpDI6cpUu9Bq17GXw82sqGwnAaKNxuahEUX9oife2gT+YcEA2XTnDJAhYQF9 aDoydGNOp+2uSYpMQ1u/X/sF7MSp7lafJAFoz/70EN5Q002yG461ebUG6/qc6WQ7KQxq IYi2f1iEny8lklr3rZKxqw4dWIO956Xj2OR4Jssg3NbPw7SNnpCWUPnk/jY/XdjEjt1R o5HMAIF2uBs/cADO+X0KzBmsHbxRsFsLRPuMcoYdNRUbJFzphsOrpCDwL/Abp9K/R0nq 66SDvqzOEvjOSDpFv9O5W+/A4TjbahLJVkC460B+tONOD0RA5yougZV0uG6ag2hUiJrl tSrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=g4zEzo5NcSs7ChSRMHLU2CYO2jCxB5nfA8k+ievYaHo=; b=RFHY036iy6apznt7VjjOxv5i6dredIDLWHbX2GWtAEVR6r17SmMM1e7Hd/Cep/fXwQ phiabszjNbgW6Z1BkPQkyr+peI8g09QcAsnitsjX7c2ePyTYDRSJsggDfjgy7nDH8w88 dVRFKoJ22RYUD+6ifpYfjsLYLVQu/KM/s06saJHqUnv6hDireWQ0kQ3TO3sM+2/X58+n iQjvUIOddbaXG/B4DmeQ61zbg2wsZzDgcwzMNI65pBI90BjhGjryIzLxkRUO9N4fM2cC hnhbFd2pPsLEHTHuU3fYtcDBCPlerkVQf1AAivUmTUjbfu99A8cHTed0ZMWREVYzKTn2 ETtQ== X-Gm-Message-State: APjAAAUDNf6xg2FiFFxsnnavW5kf8B76WifGteHz6tNU+Fp1g5ZIZyWU omOOHrbYT0NvQ9odzdnPpB87/fv0 X-Google-Smtp-Source: APXvYqxMUzRDYfGUxp3ZeYHXramC3JssWC7Lntu8Vo/SBtU+E3413qPUDXS3zXUz96zyoCb0wKFAlg== X-Received: by 2002:a05:6000:12c9:: with SMTP id l9mr6524706wrx.304.1576155206901; Thu, 12 Dec 2019 04:53:26 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id n189sm5193825wme.33.2019.12.12.04.53.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2019 04:53:26 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 029/132] meson: generate shader headers Date: Thu, 12 Dec 2019 13:51:13 +0100 Message-Id: <1576155176-2464-30-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> References: <1576155176-2464-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau Signed-off-by: Marc-André Lureau Signed-off-by: Paolo Bonzini --- Makefile | 18 ------------------ meson.build | 1 + ui/meson.build | 2 ++ ui/shader/meson.build | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 ui/shader/meson.build diff --git a/Makefile b/Makefile index 5d0be7b..472962d 100644 --- a/Makefile +++ b/Makefile @@ -582,24 +582,6 @@ cscope: find "$(SRC_PATH)/" -name "*.[chsS]" -print | sed 's,^\./,,' > "$(SRC_PATH)/cscope.files" cscope -b -i"$(SRC_PATH)/cscope.files" -# opengl shader programs -ui/shader/%-vert.h: $(SRC_PATH)/ui/shader/%.vert $(SRC_PATH)/scripts/shaderinclude.pl - @mkdir -p $(dir $@) - $(call quiet-command,\ - perl $(SRC_PATH)/scripts/shaderinclude.pl $< > $@,\ - "VERT","$@") - -ui/shader/%-frag.h: $(SRC_PATH)/ui/shader/%.frag $(SRC_PATH)/scripts/shaderinclude.pl - @mkdir -p $(dir $@) - $(call quiet-command,\ - perl $(SRC_PATH)/scripts/shaderinclude.pl $< > $@,\ - "FRAG","$@") - -ui/shader.o: $(SRC_PATH)/ui/shader.c \ - ui/shader/texture-blit-vert.h \ - ui/shader/texture-blit-flip-vert.h \ - ui/shader/texture-blit-frag.h - # documentation MAKEINFO=makeinfo MAKEINFOINCLUDES= -I docs -I $(