Remove double iteration

ppy · Jun 21, 2023 · 53d00ee · 53d00ee
1 parent 1ceae4b
commit 53d00ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/osu.Framework/Graphics/OpenGL/Shaders/GLShader.cs b/osu.Framework/Graphics/OpenGL/Shaders/GLShader.cs
@@ -181,11 +181,11 @@ private protected virtual bool CompileInternal()
 
                 if (layout.Elements.Any(e => e.Kind == ResourceKind.TextureReadOnly || e.Kind == ResourceKind.TextureReadWrite))
                 {
-                    ResourceLayoutElementDescription textureDesc = layout.Elements.First(e => e.Kind == ResourceKind.TextureReadOnly || e.Kind == ResourceKind.TextureReadWrite);
+                    ResourceLayoutElementDescription textureElement = layout.Elements.First(e => e.Kind == ResourceKind.TextureReadOnly || e.Kind == ResourceKind.TextureReadWrite);
+
                     if (layout.Elements.All(e => e.Kind != ResourceKind.Sampler))
-                        throw new ProgramLinkingFailedException(name, $"Texture {textureDesc.Name} has no associated sampler.");
+                        throw new ProgramLinkingFailedException(name, $"Texture {textureElement.Name} has no associated sampler.");
 
-                    var textureElement = layout.Elements.First(e => e.Kind == ResourceKind.TextureReadOnly || e.Kind == ResourceKind.TextureReadWrite);
                     textureUniforms.Add(new Uniform<int>(renderer, this, textureElement.Name, GL.GetUniformLocation(this, textureElement.Name))
                     {
                         Value = textureIndex++

diff --git a/osu.Framework/Graphics/Veldrid/Shaders/VeldridShader.cs b/osu.Framework/Graphics/Veldrid/Shaders/VeldridShader.cs
@@ -181,9 +181,10 @@ private void compile()
 
                     if (layout.Elements.Any(e => e.Kind == ResourceKind.TextureReadOnly || e.Kind == ResourceKind.TextureReadWrite))
                     {
-                        ResourceLayoutElementDescription textureDesc = layout.Elements.First(e => e.Kind == ResourceKind.TextureReadOnly || e.Kind == ResourceKind.TextureReadWrite);
+                        ResourceLayoutElementDescription textureElement = layout.Elements.First(e => e.Kind == ResourceKind.TextureReadOnly || e.Kind == ResourceKind.TextureReadWrite);
+
                         if (layout.Elements.All(e => e.Kind != ResourceKind.Sampler))
-                            throw new InvalidOperationException($"Texture {textureDesc.Name} has no associated sampler.");
+                            throw new InvalidOperationException($"Texture {textureElement.Name} has no associated sampler.");
 
                         textureLayouts.Add(new VeldridUniformLayout(set, renderer.Factory.CreateResourceLayout(layout)));
                     }