From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 450634C251 for ; Fri, 23 May 2025 20:24:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 2574668DF5A; Fri, 23 May 2025 23:24:01 +0300 (EEST) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 872F668DF4E for ; Fri, 23 May 2025 23:23:59 +0300 (EEST) Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-601aa0cb92eso372402a12.0 for ; Fri, 23 May 2025 13:23:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748031838; x=1748636638; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=F7T7KnV9/ZJxiG2NG+S+Fs+Bmdry8ZkUFC8dpfMv93s=; b=lN2uvxOe9oP1wPzWdAMou6alaOhrjMAe9t7kDeXs/JVhr6D5CgNt7DwLFIQPHJ8FK6 89UGDF/XC9tE34cmmwt0CY6IoNSiiRbcsP9qUmxjWIyiUyiDWd2yMYiridPdzV7J2hQ1 j3NQ8zNs/Z6ws/XY37xibLAhu3UUFBICFiZiwvQCW/kZqmyEX4W33p0hjaM/B+hcZvjo 0rffNEZ210KuToODLUq853b2CkF/oMskTQh+j8RgvjWSlbAyvxEafHM+UUWcW/1LwJxH 26JfZ+4+NxUncweVF5C8NMyV/gU0F69GO2kFnMi9V8UVnORQaDOHjWghH0dOuaUQx6qo xtlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748031838; x=1748636638; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F7T7KnV9/ZJxiG2NG+S+Fs+Bmdry8ZkUFC8dpfMv93s=; b=jTaBNS+vUMFhOZ7v6KM9LxkRyBF3Hrk043b0ZgROs9uIB6xWgHsacD9i1xcWJE0oTw hpbkKkWyQ6TlLZOmFf+Ov+0cHAVwftA74J8s+5lbaXQ9As6PPpicYO8C9/7oozBW/BuX xP3lU/bDidk0Z/qJRaUEhlUSvrZobLfxdVuj+25EjodBroLF+IVw4LTDtD1Eao01HX5M CpAYseUF31CNUOOp/a2h+oX/nsWE0R1bSgGB8zqAZFS1bbgG68V0zgAfRb4thS24wWZc P3dF478Oa/dZ8Y97FVCdZWzMiRBuwaSbpq/n14PkxTm0vjuRzSXHvB7E0TBJRv2P736s e+eQ== X-Gm-Message-State: AOJu0YxMQQAoZll9+wK1u0NqM1KmWp4373CGtQqJtWQiJgddzCuJ/fMb IGtAbPCRi9ZPXxrFGOYX/P4h1KAUWTYc6jeKHn6LdeBHNt/AlSBJWRxdFgr/UdZs X-Gm-Gg: ASbGncvRTEXDaWg8yRXIIyKmwA9IDsqiUYgoDOp4TpCYw0IcbUr4BwwOdya5PITX9x5 dEXaoyeDS7DEhe2hhuvGoJ/iEVhHaA67WiUDWWV4w52faGNcfIFtmC9MebO2POcrCe2tdKeAjTB e/kTEY7dIBnbqb6yWSIeQnVEnC/OpDUGtr+LS9g2A0smteqk/kHFYgSwm+YpDl5/Yy0o0OrCZyk yUsbXURJHmJOWpoUhABatcwMlimwNljd4BzDa9LMuJmrl7mAY53uwBTHPTNIzhv7hY20luunJbY dg5LpSUWtX1U70+NwelmSV4gMEMVDywnoIM/VAAgJbEcLH/rZkzLVUVIhc+fcDbXt9mOTCtyfDA av0NLj8aBqut7LShAH8hdn6lgVimlDDs= X-Google-Smtp-Source: AGHT+IFort4LauibSBZV/X9tv1GL+Kcp0y6rPwvt9uC3+BMOSYmdFKbnxIRhLj2pgDQI8QwvW+IQHg== X-Received: by 2002:a17:906:4a8d:b0:ad5:c462:3f60 with SMTP id a640c23a62f3a-ad85b1844f9mr34348766b.16.1748031837938; Fri, 23 May 2025 13:23:57 -0700 (PDT) Received: from localhost.localdomain ([2a02:586:492f:c100:6ad2:ae5e:29f0:f110]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad52d04e821sm1291267166b.17.2025.05.23.13.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 May 2025 13:23:57 -0700 (PDT) From: IndecisiveTurtle X-Google-Original-From: IndecisiveTurtle <47210458+raphaelthegreat@users.noreply.github.com> To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 May 2025 23:23:47 +0300 Message-ID: <20250523202351.1712778-3-47210458+raphaelthegreat@users.noreply.github.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250523202351.1712778-1-47210458+raphaelthegreat@users.noreply.github.com> References: <20250523202351.1712778-1-47210458+raphaelthegreat@users.noreply.github.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 3/4] libavcodec/vulkan: Add modifications to common shader for VC2 vulkan encoder 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: , Reply-To: FFmpeg development discussions and patches Cc: IndecisiveTurtle Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: IndecisiveTurtle --- libavcodec/vulkan/common.comp | 51 ++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/libavcodec/vulkan/common.comp b/libavcodec/vulkan/common.comp index 10af9c0623..59a4a4b1a8 100644 --- a/libavcodec/vulkan/common.comp +++ b/libavcodec/vulkan/common.comp @@ -18,6 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#extension GL_EXT_buffer_reference : require +#extension GL_EXT_buffer_reference2 : require + layout(buffer_reference, buffer_reference_align = 1) buffer u8buf { uint8_t v; }; @@ -61,22 +64,20 @@ layout(buffer_reference, buffer_reference_align = 8) buffer u64buf { #define mid_pred(a, b, c) \ max(min((a), (b)), min(max((a), (b)), (c))) -/* TODO: optimize */ + uint align(uint src, uint a) { - uint res = src % a; - if (res == 0) - return src; - return src + a - res; + return (src + a - 1) & ~(a - 1); +} + +int align(int src, int a) +{ + return (src + a - 1) & ~(a - 1); } -/* TODO: optimize */ uint64_t align64(uint64_t src, uint64_t a) { - uint64_t res = src % a; - if (res == 0) - return src; - return src + a - res; + return (src + a - 1) & ~(a - 1); } #define reverse4(src) \ @@ -146,6 +147,36 @@ void put_bits(inout PutBitContext pb, const uint32_t n, uint32_t value) } } +void put_bits63(inout PutBitContext pb, const uint32_t n, uint64_t value) +{ + if (n < pb.bit_left) { + pb.bit_buf = (pb.bit_buf << n) | value; + pb.bit_left -= uint8_t(n); + } else { + pb.bit_buf <<= pb.bit_left; + pb.bit_buf |= (value >> (n - pb.bit_left)); + +#ifdef PB_UNALIGNED + u8buf bs = u8buf(pb.buf); + [[unroll]] + for (uint8_t i = uint8_t(0); i < BUF_BYTES; i++) + bs[i].v = BYTE_EXTRACT(pb.bit_buf, BUF_BYTES - uint8_t(1) - i); +#else +#ifdef DEBUG + if ((pb.buf % BUF_BYTES) != 0) + debugPrintfEXT("put_bits buffer is not aligned!"); +#endif + + BUF_TYPE bs = BUF_TYPE(pb.buf); + bs.v = BUF_REVERSE(pb.bit_buf); +#endif + pb.buf = uint64_t(bs) + BUF_BYTES; + + pb.bit_left += BUF_BITS - uint8_t(n); + pb.bit_buf = value; + } +} + uint32_t flush_put_bits(inout PutBitContext pb) { /* Align bits to MSBs */ -- 2.49.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".