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 ED2D54F1ED for ; Sat, 17 May 2025 20:49:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id A336168D903; Sat, 17 May 2025 23:49:25 +0300 (EEST) Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 79B8868D50E for ; Sat, 17 May 2025 23:49:17 +0300 (EEST) Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-5fff52493e0so3398743a12.3 for ; Sat, 17 May 2025 13:49:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1747514956; x=1748119756; 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=Wd3s4X+DEjME//WnPa6/7MWVPVjWRB0XB3ksU3SMn3I=; b=NwJS30iKxA8gOqXC00apF+B/69DWPTnPKo+AtrywG50ek245yp9oviFKs61QeJWpXw j6hKsNa1DHL3MaFInL2PZhEBrrKLtnwQ8unRQsNNPLFG8GPOx+jUKJpRZMLEZ9kmOvDV oBdY+4ASgI1kKp2rTxChL+yfY364GL+Zx8PzjTEZvnyQErdWsbBwOKkmZ1Rkf4iPj9/u rSdBkYY7ApDJusW936Yz6UJVaZyH+LyTL9c4g0Wm7sbvZeb//xCWNaFauOj7/Tw5Fh+f qeoiABVqrTrrs+cXTbUjO3OYQY6VwLDPSs0CA0wz2EfyoMOu7T5FDzpYMGn/IFGkeBTQ eQpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747514956; x=1748119756; 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=Wd3s4X+DEjME//WnPa6/7MWVPVjWRB0XB3ksU3SMn3I=; b=MSLrakvw9dDnAG7sptVFkpmI1+O7mW5ioyy96I6Bi7fUaUBIxMeXWwLB4x1toVlCyU ty/ioJpJjn3W4SmMXAn2IUBdywJlUzX+pjV8xlQ6yFQgus77koTi3srA3PuKvYy4x1MA wWglxCYlbSVzSMC7vFk1FNBltzD7frgfWYvcH8o3EguJzKfkUhVkufyXkJ2D2Y+8A20M IUZEWqoZ0JKEUh3bOQIzeJrk1ikazgE22TsuPISVkgeStVIaHjy/QRU81+MrqlMuOF/2 wTelme7Ii5imS538WNgaVJ9nScVqU/JC1R/J8QCRQMc0KCkhjwpBtmhlnpnJRJR6wjwo PceQ== X-Gm-Message-State: AOJu0YzEK1KoU2+SBITXirVavILDcDGEFOm/XEToGVwNsTDwxT7qkNGw fmPrtiZ3qoSNE5B+I1D9dhxC8Lhzw9B/al8/ueCOE9dQULXrvzd1NNtApDbH1g== X-Gm-Gg: ASbGnctn0al4xYHOmxmHSeymW2F6an1YLzHd+cv7+JX2SDYFYuXCiFHuQe8bonNc+IL dNTaOU7PcQ4SKUzifMG2t36+SUemIfBSOZ0WsG2pWYzhQbrS9tvPsb+PNYKO51dBEnBw+u816cM DFYZnXQ2+Y9OGV3MUUpSvJV/65Ne8k7uBt+FN0eePMcxwK8fGkcYoMoaROhCbnfoWy/NeRxAyCc 3vsd617VmoUwH2YfZgUvFu+JlfKw7I1KEk4PhdABdueLeld5SU1XQ+K86qkArbZZLOrsiYDOY7f 0mrxs4990iPxN9IrZkimvrQ0Gw7evhBbUXa0sOrJVcH6TJeAn+CkBMjJ+aBRqp9NQhpIl/XDLbe boGPiDncf494v2B4zO7TbhaOYfG+x3+4= X-Google-Smtp-Source: AGHT+IHsrVTwrHRPE+j2XNw+rw7k3d/V+UvST/AfjZf4q7unNYUS7x+sapbiKWz8v8mmvPUIX3nq0w== X-Received: by 2002:a05:6402:2343:b0:5f6:c4ed:e24e with SMTP id 4fb4d7f45d1cf-60090110e2emr8211499a12.27.1747514956341; Sat, 17 May 2025 13:49:16 -0700 (PDT) Received: from localhost.localdomain ([2a02:586:492f:c100:6ad2:ae5e:29f0:f110]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6005a6e6366sm3274064a12.44.2025.05.17.13.49.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 May 2025 13:49:15 -0700 (PDT) From: IndecisiveTurtle X-Google-Original-From: IndecisiveTurtle <47210458+raphaelthegreat@users.noreply.github.com> To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 May 2025 23:48:50 +0300 Message-ID: <20250517204907.482987-3-47210458+raphaelthegreat@users.noreply.github.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250517204907.482987-1-47210458+raphaelthegreat@users.noreply.github.com> References: <20250517204907.482987-1-47210458+raphaelthegreat@users.noreply.github.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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 | 54 ++++++++++++++++++++++++++++------- 1 file changed, 44 insertions(+), 10 deletions(-) diff --git a/libavcodec/vulkan/common.comp b/libavcodec/vulkan/common.comp index 10af9c0623..db216a2ac6 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) \ @@ -167,6 +168,39 @@ uint32_t flush_put_bits(inout PutBitContext pb) return uint32_t(pb.buf - pb.buf_start); } +void skip_put_bytes(inout PutBitContext pb, int n) +{ + int bytes_left = pb.bit_left >> 3; + if (n < bytes_left) + { + int n_bits = n << 3; + int mask = (1 << n_bits) - 1; + pb.bit_buf <<= n_bits; + pb.bit_buf |= mask; + pb.bit_left -= uint8_t(n_bits); + return; + } + if (pb.bit_left < BUF_BITS) + { + int mask = (1 << pb.bit_left) - 1; + pb.bit_buf <<= pb.bit_left; + pb.bit_buf |= mask; + u32vec2buf(pb.buf).v = BUF_REVERSE(pb.bit_buf); + pb.buf += BUF_BYTES; + n -= pb.bit_left >> 3; + } + int skip_dwords = n >> 2; + while (skip_dwords > 0) + { + u8vec4buf(pb.buf).v = u8vec4(0xFF); + pb.buf += 4; + skip_dwords--; + } + int skip_bits = (n & 3) << 3; + pb.bit_buf = (1 << skip_bits) - 1; + pb.bit_left = uint8_t(BUF_BITS - skip_bits); +} + void init_put_bits(out PutBitContext pb, u8buf data, uint64_t len) { pb.buf_start = uint64_t(data); -- 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".