Merge 3c0e90f047 into 7d158acc3b

Do not try to create a texture pool if shader does not use textures (#7379 )
Support ffmpeg 6.x
2024-12-16 15:36:34 +00:00 · 2024-09-30 17:14:30 -03:00 · 2024-09-30 11:41:07 -03:00 · 2024-07-22 19:24:38 -05:00
2 changed files with 3 additions and 3 deletions
--- a/src/Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs
+++ b/src/Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs
@ -743,7 +743,7 @@ namespace Ryujinx.Graphics.Gpu.Shader
                constantBufferUsePerStageMask &= ~(1 << index);
            }
-            if (checkTextures)
+            if (checkTextures && _allTextures.Length > 0)
            {
                TexturePool pool = channel.TextureManager.GetTexturePool(poolState.TexturePoolGpuVa, poolState.TexturePoolMaximumId);
--- a/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs
+++ b/src/Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs
@ -12,8 +12,8 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
        private static readonly Dictionary<string, (int, int)> _librariesWhitelist = new()
        {
-            { AvCodecLibraryName, (58, 59) },
+            { AvCodecLibraryName, (58, 60) },
-            { AvUtilLibraryName, (56, 57) },
+            { AvUtilLibraryName, (56, 58) },
        };
        private static string FormatLibraryNameForCurrentOs(string libraryName, int version)
Author	SHA1	Message	Date
Reilly Brogan	250bbb3ffc	Merge `3c0e90f047` into `7d158acc3b`	2024-09-30 17:14:30 -03:00
gdkchan	7d158acc3b	Do not try to create a texture pool if shader does not use textures (#7379 )	2024-09-30 11:41:07 -03:00
Reilly Brogan	3c0e90f047	Support ffmpeg 6.x	2024-07-22 19:24:38 -05:00