mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIx compilation errors

Browse source
This commit is contained in:
Kenny van Vulpen 2018-10-23 23:57:00 +02:00
commit 648a2522a7
No known key found for this signature in database
GPG key ID: BBD011B8B9C45F87
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Ryujinx.Graphics/Gal/OpenGL/OGLRenderTarget.cs
View file

@ -48,9 +48,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
{ {
for (int index = 0; index < RenderTargetsCount; index++) for (int index = 0; index < RenderTargetsCount; index++)
{ {
Map[index] = Source.Map[index]; Map[index] = source.Map[index];
Colors[index] = Source.Colors[index]; Colors[index] = source.Colors[index];
} }
MapCount = source.MapCount; MapCount = source.MapCount;
@ -164,9 +164,9 @@ namespace Ryujinx.Graphics.Gal.OpenGL
// if (_attachments.Zeta != _oldAttachments.Zeta) // if (_attachments.Zeta != _oldAttachments.Zeta)
//{ //{
if (_attachments.Zeta != 0 && _texture.TryGetImageHandler(_attachments.Zeta, out cachedImage) if (_attachments.Zeta != 0 && _texture.TryGetImageHandler(_attachments.Zeta, out cachedImage))
{ {
if (_cachedImage.Handle != _zetaHandle) if (cachedImage.Handle != _zetaHandle)
{ {
if (cachedImage.HasDepth && cachedImage.HasStencil) if (cachedImage.HasDepth && cachedImage.HasStencil)
{ {
@ -192,10 +192,10 @@ namespace Ryujinx.Graphics.Gal.OpenGL
} }
else else
{ {
throw new InvalidOperationException("Invalid image format \"" + CachedImage.Format + "\" used as Zeta!"); throw new InvalidOperationException("Invalid image format \"" + cachedImage.Format + "\" used as Zeta!");
} }
_zetaHandle = CachedImage.Handle; _zetaHandle = cachedImage.Handle;
} }
} }
else if (_zetaHandle != 0) else if (_zetaHandle != 0)
@ -206,7 +206,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
0, 0,
0); 0);
ZetaHandle = 0; _zetaHandle = 0;
} }
if (OglExtension.ViewportArray) if (OglExtension.ViewportArray)
@ -235,7 +235,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
GL.DrawBuffer(DrawBufferMode.None); GL.DrawBuffer(DrawBufferMode.None);
} }
_oldAttachments.SetAndClear(_attachments); _oldAttachments.Update(_attachments);
} }
public void BindColor(long key, int attachment) public void BindColor(long key, int attachment)

6
Ryujinx.Graphics/Gal/OpenGL/OGLTexture.cs
View file

@ -24,10 +24,10 @@ namespace Ryujinx.Graphics.Gal.OpenGL
_textureCache.Unlock(); _textureCache.Unlock();
} }
private static void DeleteTexture(ImageHandler cachedImage) private void DeleteTexture(ImageHandler cachedImage)
{ {
GL.DeleteTexture(cachedImage.Handle); TextureDeleted?.Invoke(this, cachedImage.Handle);
TextureDeleted?.Invoke(this, cachedImage.Handle); GL.DeleteTexture(cachedImage.Handle);
} }
public void Create(long key, int size, GalImage image) public void Create(long key, int size, GalImage image)