emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Fix value of constant vertex attributes (#2307)

Browse source
This commit is contained in:
gdkchan 2021-05-24 04:38:38 -03:00 committed by GitHub
parent 79092310fa
commit 3fd6b55f04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Ryujinx.Graphics.OpenGL/VertexArray.cs
View file

@ -80,7 +80,7 @@ namespace Ryujinx.Graphics.OpenGL
if (attrib.IsZero) if (attrib.IsZero)
{ {
// Disabling the attribute causes the shader to read a constant value. // Disabling the attribute causes the shader to read a constant value.
// The value is configurable, but by default is a vector of (0, 0, 0, 1). // We currently set the constant to (0, 0, 0, 0).
DisableVertexAttrib(index); DisableVertexAttrib(index);
} }
else else
@ -176,6 +176,7 @@ namespace Ryujinx.Graphics.OpenGL
{ {
_vertexAttribsInUse &= ~mask; _vertexAttribsInUse &= ~mask;
GL.DisableVertexAttribArray(index); GL.DisableVertexAttribArray(index);
GL.VertexAttrib4(index, 0f, 0f, 0f, 0f);
} }
} }

5
Ryujinx.Graphics.Shader/Translation/Translator.cs
View file

@ -129,8 +129,7 @@ namespace Ryujinx.Graphics.Shader.Translation
{ {
config.SetUsedFeature(FeatureFlags.Bindless); config.SetUsedFeature(FeatureFlags.Bindless);
} }
else // Not bindless, fill up texture handles
{
for (int funcIndex = 0; funcIndex < cfg.Length; funcIndex++) for (int funcIndex = 0; funcIndex < cfg.Length; funcIndex++)
{ {
for (int blkIndex = 0; blkIndex < cfg[funcIndex].Length; blkIndex++) for (int blkIndex = 0; blkIndex < cfg[funcIndex].Length; blkIndex++)
@ -142,6 +141,8 @@ namespace Ryujinx.Graphics.Shader.Translation
maxEndAddress = block.EndAddress; maxEndAddress = block.EndAddress;
} }
if (!hasBindless)
{
for (int index = 0; index < block.OpCodes.Count; index++) for (int index = 0; index < block.OpCodes.Count; index++)
{ {
if (block.OpCodes[index] is OpCodeTextureBase texture) if (block.OpCodes[index] is OpCodeTextureBase texture)