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 8653E4D940 for ; Mon, 2 Jun 2025 19:13:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 7F06468DF52; Mon, 2 Jun 2025 22:13:33 +0300 (EEST) Received: from mail-ej1-f54.google.com (mail-ej1-f54.google.com [209.85.218.54]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id E762768DF55 for ; Mon, 2 Jun 2025 22:13:25 +0300 (EEST) Received: by mail-ej1-f54.google.com with SMTP id a640c23a62f3a-ad572ba1347so708675366b.1 for ; Mon, 02 Jun 2025 12:13:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748891605; x=1749496405; 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=cG0gE97a0/JsdLB4XIqHz8qPgQszCfi+bKH0ulIUDJ360f/U1bzmdUN9YA1PYQ/vKc BE25FmVr/LnIUFzbwVmQQe/XtRUgJcylQPtuuhWazrCHGOx1eBOq5xYge1FN5tJYbwqx dNkjUD3VKu0u0GlJhcwG+tBB7K7Lk6BUs/2dEC0h+di6T0tjh9PtxQc9o95dJMQY/mkz 7Rx4dReNyuVQ0ZotGWP68DVGPDJBCvrZU7SX7DpaedFfMGxk5D8cDMSWCgdsR2KUMoQA 57acRNj8legJFogX3YFZGzpHvqsl2I+t7Getarc2ZC3AmJJSwC5XoRY2+kiif1c5RRKl pzFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748891605; x=1749496405; 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=RxTxFEA13OcfS041s5wvrKLtinG41FKkMEAn4S0ZO+436iOMMzDKo86spncUv6Olxj eZNik+8jKv4viOnbAP6GoEPmgTeuZ0QpdJG8ovCXrw8cO9zbCrpx9GP86Df25pl4q9Vi xeQOLv9AmHQ86lmeXWdU0PagF0pEvKQOyyDsGk0nlPcj3kdIlEbGX/38OJwhjV8wfZkF 7w93RMKQbgQtVecpCUXOWYF9boo8VmgLbr0IDDjV9GX7aKfT1sPbm0dy41R7D0s4GPIf QAftpD+YgRig28eBKBx3QEZKk3LEOjNhizFfTj3n7z4pL4RurQwHoSsYXd/MH7nVwOvL 8Slw== X-Gm-Message-State: AOJu0Yw9aqUfHfulO5xc6xkeDtyLW1Pr9xJeZR5ucmbO0V36lwY+pXTV s3FPJnqNY0sg9gaRSsBQnlYBa6p3YY0z3FBRkLzHXs4M7ie92/zxspAW/BJE3Q== X-Gm-Gg: ASbGncuHRZs16ra+qD1PRHa+GgG7U8ubgGofkE1L1iAgM6/QEM0Z/nWQpcyZoWg4Eoz YkZymJBayP1Wkh2DQ3o3bwuJLV4UJxB9zP43i28valJf8NyGFEkClQRnMk6Nc8V5w24ty48NaH6 TCsAqXuqY3DGu6y+kV2Fgv4YNCLS8U4n4Gctq59syQjJJBF/eV03F0jPNu8Bf6KIVaO17xcgNTg 0flE0zW43vf0GXAvsmcScYEMTghiSXXflTE9UAxuGfANYqr9CbDC7DFTauJWc6Hki5XFwfJ7FxM 8MAUPaGEHHt1E7iEjpJIwEwCToDNTwcAWvAhhT4P+FMuTQw3jFy9RcYW+m+5eGv6rPZN9VgYz/j aIAbJpmql2chA1StwsyYb9yr4BTyRZZB3LKAmjuWN9g== X-Google-Smtp-Source: AGHT+IGKLHmFOrVNw0c6gtQcDYYgBUgRsM2ETVAspl+IFAPazgnE94nprRrJAiOdB8uhn/mPGId+eg== X-Received: by 2002:a17:907:7f29:b0:ad2:4eef:d33a with SMTP id a640c23a62f3a-adb493ca952mr925056266b.15.1748891604616; Mon, 02 Jun 2025 12:13:24 -0700 (PDT) Received: from localhost.localdomain ([2a02:586:492f:c100:6ad2:ae5e:29f0:f110]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ada6ad39434sm844000466b.141.2025.06.02.12.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Jun 2025 12:13:23 -0700 (PDT) From: IndecisiveTurtle X-Google-Original-From: IndecisiveTurtle <47210458+raphaelthegreat@users.noreply.github.com> To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Jun 2025 22:12:50 +0300 Message-ID: <20250602191313.906527-3-47210458+raphaelthegreat@users.noreply.github.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602191313.906527-1-47210458+raphaelthegreat@users.noreply.github.com> References: <20250602191313.906527-1-47210458+raphaelthegreat@users.noreply.github.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 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".