sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-04-29 10:47:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Update UBO usages inline with framework changes

Browse Source
This commit is contained in:
Salman Ahmed 2023-03-16 14:06:35 +03:00
parent 15c44a2817
commit 678e8ed736
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Rulesets.Osu/Skinning/SmokeSegment.cs
View File

@ -252,13 +252,14 @@ namespace osu.Game.Rulesets.Osu.Skinning
renderer.SetBlend(BlendingParameters.Additive); renderer.SetBlend(BlendingParameters.Additive);
renderer.PushLocalMatrix(DrawInfo.Matrix); renderer.PushLocalMatrix(DrawInfo.Matrix);
TextureShader.Bind(); BindTextureShader(renderer);
texture.Bind(); texture.Bind();
for (int i = 0; i < points.Count; i++) for (int i = 0; i < points.Count; i++)
drawPointQuad(points[i], textureRect, i + firstVisiblePointIndex); drawPointQuad(points[i], textureRect, i + firstVisiblePointIndex);
TextureShader.Unbind(); UnbindTextureShader(renderer);
renderer.PopLocalMatrix(); renderer.PopLocalMatrix();
} }

8
osu.Game.Tests/Visual/Background/TestSceneTriangleBorderShader.cs
View File

@ -100,8 +100,10 @@ namespace osu.Game.Tests.Visual.Background
private IUniformBuffer<TriangleBorderData>? borderDataBuffer; private IUniformBuffer<TriangleBorderData>? borderDataBuffer;
public override void Draw(IRenderer renderer) protected override void BindUniformResources(IShader shader, IRenderer renderer)
{ {
base.BindUniformResources(shader, renderer);
borderDataBuffer ??= renderer.CreateUniformBuffer<TriangleBorderData>(); borderDataBuffer ??= renderer.CreateUniformBuffer<TriangleBorderData>();
borderDataBuffer.Data = borderDataBuffer.Data with borderDataBuffer.Data = borderDataBuffer.Data with
{ {
@ -109,9 +111,7 @@ namespace osu.Game.Tests.Visual.Background
TexelSize = texelSize TexelSize = texelSize
}; };
TextureShader.BindUniformBlock("m_BorderData", borderDataBuffer); shader.BindUniformBlock("m_BorderData", borderDataBuffer);
base.Draw(renderer);
} }
protected override bool CanDrawOpaqueInterior => false; protected override bool CanDrawOpaqueInterior => false;

2
osu.Game/Graphics/Backgrounds/Triangles.cs
View File

@ -306,7 +306,7 @@ namespace osu.Game.Graphics.Backgrounds
}; };
shader.Bind(); shader.Bind();
shader.BindUniformBlock("m_BorderData", borderDataBuffer); shader.BindUniformBlock(@"m_BorderData", borderDataBuffer);
foreach (TriangleParticle particle in parts) foreach (TriangleParticle particle in parts)
{ {

2
osu.Game/Graphics/Backgrounds/TrianglesV2.cs
View File

@ -249,7 +249,7 @@ namespace osu.Game.Graphics.Backgrounds
}; };
shader.Bind(); shader.Bind();
shader.BindUniformBlock("m_BorderData", borderDataBuffer); shader.BindUniformBlock(@"m_BorderData", borderDataBuffer);
Vector2 relativeSize = Vector2.Divide(triangleSize, size); Vector2 relativeSize = Vector2.Divide(triangleSize, size);

8
osu.Game/Graphics/Sprites/LogoAnimation.cs
View File

@ -59,14 +59,14 @@ namespace osu.Game.Graphics.Sprites
private IUniformBuffer<AnimationData> animationDataBuffer; private IUniformBuffer<AnimationData> animationDataBuffer;
protected override void Blit(IRenderer renderer) protected override void BindUniformResources(IShader shader, IRenderer renderer)
{ {
base.BindUniformResources(shader, renderer);
animationDataBuffer ??= renderer.CreateUniformBuffer<AnimationData>(); animationDataBuffer ??= renderer.CreateUniformBuffer<AnimationData>();
animationDataBuffer.Data = animationDataBuffer.Data with { Progress = progress }; animationDataBuffer.Data = animationDataBuffer.Data with { Progress = progress };
TextureShader.BindUniformBlock("m_AnimationData", animationDataBuffer); shader.BindUniformBlock(@"m_AnimationData", animationDataBuffer);
base.Blit(renderer);
} }
protected override bool CanDrawOpaqueInterior => false; protected override bool CanDrawOpaqueInterior => false;

2
osu.Game/Rulesets/Mods/ModFlashlight.cs
View File

@ -273,7 +273,7 @@ namespace osu.Game.Rulesets.Mods
}; };
shader.Bind(); shader.Bind();
shader.BindUniformBlock("m_FlashlightParameters", flashlightParametersBuffer); shader.BindUniformBlock(@"m_FlashlightParameters", flashlightParametersBuffer);
renderer.DrawQuad(renderer.WhitePixel, screenSpaceDrawQuad, DrawColourInfo.Colour, vertexAction: addAction); renderer.DrawQuad(renderer.WhitePixel, screenSpaceDrawQuad, DrawColourInfo.Colour, vertexAction: addAction);