From patchwork Sun Sep 29 09:42:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 51922 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d8ca:0:b0:48e:c0f8:d0de with SMTP id dy10csp1341118vqb; Sun, 29 Sep 2024 02:43:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUNF6SvkxW1aJpHalvrK4C6YMfyKu0d02JBym6EU86bwUnB+8Ty8sINCiEpYLELaJzM48Qwwh47J45qvocPzQjo@gmail.com X-Google-Smtp-Source: AGHT+IEgkv3/MzewlHn8Fn3jchTqVVZ9P00FrApmt3/87Vf9y/1ifjQqN9ijM32TK9+dzjQnFOs+ X-Received: by 2002:a2e:4c0a:0:b0:2f9:ce91:dea9 with SMTP id 38308e7fff4ca-2f9d41b5f4amr31004061fa.32.1727603012435; Sun, 29 Sep 2024 02:43:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727603012; cv=none; d=google.com; s=arc-20240605; b=YTtfh1GWywBI0GwryMzaXURugTbd1TB0Yf/jabrb/RweM9Xyi6mXTKWi4C8mjiL/UO sKyqcFvjwJyQ3FRm9v1ENtHg7rgx9igmgSPFyBLwd7VwJI9QAfFbkPqkLLrd3j3JNln5 eZcaznjpgfeRXj2MqpYFEYSVDUF4qUoAKc/kzBpKj9+UDMcvYNc92iQ4+AINo9dgzjOz xEFlMt6miLIOerePFib+NGErZ8gWr6BqYSp/Cgjhsv7D0knLsew5pO8FvxaNmJ+GSsUb FuvJLL2whquAs/4cXvJPYtj4PlBn5+94WxvK2cqFYSyB5cfzILNU264WL8oscwBH7hM0 Hx8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:delivered-to; bh=oVxiR4d6fQVVzwhkLwmkv+IFwF3/JDgcpdst36YSYlA=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=dOq0l2Yf31R3wxZUcvv8pxNtwpXI0BBelkSOqS4iOhaDQsUExrQEbA7b14u5ZZssC+ DlHVINKzl5AbU30EUuO/4DA6VB+Sa2tH/tI+3dhSNEggWVpoApOPMc0D8tyyKQVFzcmT JUqr9x/h2rRt9CuUux0YRSMDwHtXzd9VYeT2Ea6CYywIQ9ACbUFcTo4cATYqvG6FBLAF aI7SGRgAcORgIik1op2vsp/QnJzJTkEPRpNTfwGckIrjt3nl4Xja/b4BThpzuUhKfK7Z BpWT1oT8wA4K2hFYGXGHb/GVLBsDbAcReV+sm+T9XcQt/biUEjD2QQ6Ppsiudw2HlEW/ 971g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2f9d4643e23si19044861fa.550.2024.09.29.02.43.32; Sun, 29 Sep 2024 02:43:32 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7B59F68DA4C; Sun, 29 Sep 2024 12:43:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 935C268D983 for ; Sun, 29 Sep 2024 12:43:00 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Sep 2024 11:42:51 +0200 Message-ID: <20240929094256.396352-4-dev@lynne.ee> X-Mailer: git-send-email 2.45.2.753.g447d99e1c3b In-Reply-To: <20240929094256.396352-1-dev@lynne.ee> References: <20240929094256.396352-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] vulkan: always enable GL_EXT_scalar_block_layout X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Lynne via ffmpeg-devel From: Lynne Reply-To: FFmpeg development discussions and patches Cc: Lynne Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7zUV/RmBaHHv This makes std430 (which we use everywhere already) fully match C layout. Extension was made mandatory in 1.2. --- libavutil/hwcontext_vulkan.c | 1 + libavutil/vulkan.c | 1 + 2 files changed, 2 insertions(+) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index 6317ab7d0e..3a3aff75c0 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -1501,6 +1501,7 @@ static int vulkan_device_create_internal(AVHWDeviceContext *ctx, p->device_features_1_1.uniformAndStorageBuffer16BitAccess = dev_features_1_1.uniformAndStorageBuffer16BitAccess; p->device_features_1_2.timelineSemaphore = 1; + p->device_features_1_2.scalarBlockLayout = dev_features_1_2.scalarBlockLayout; p->device_features_1_2.bufferDeviceAddress = dev_features_1_2.bufferDeviceAddress; p->device_features_1_2.hostQueryReset = dev_features_1_2.hostQueryReset; p->device_features_1_2.storagePushConstant8 = dev_features_1_2.storagePushConstant8; diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c index 8b1c1eb796..ab2519bf35 100644 --- a/libavutil/vulkan.c +++ b/libavutil/vulkan.c @@ -1473,6 +1473,7 @@ int ff_vk_shader_init(FFVulkanContext *s, FFVulkanShader *shd, const char *name, GLSLC(0, ); if (s->extensions & FF_VK_EXT_DESCRIPTOR_BUFFER) { + GLSLC(0, #extension GL_EXT_scalar_block_layout : require ); GLSLC(0, #extension GL_EXT_buffer_reference : require ); GLSLC(0, #extension GL_EXT_buffer_reference2 : require ); }