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

Remove MaxBpp hardcoded value

Browse source
This commit is contained in:
ReinUsesLisp 2018-09-05 00:03:15 -03:00
parent c6c8a21054
commit da4bcfbf48
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Ryujinx.Graphics/Gal/OpenGL/ImageHandler.cs
View file

@ -6,9 +6,6 @@ namespace Ryujinx.Graphics.Gal.OpenGL
{
class ImageHandler
{
//TODO: Use a variable value here
public const int MaxBpp = 16;
private static int CopyBuffer = 0;
private static int CopyBufferSize = 0;
@ -39,15 +36,15 @@ namespace Ryujinx.Graphics.Gal.OpenGL
this.Image = Image;
}
public void EnsureSetup(GalImage Image)
public void EnsureSetup(GalImage NewImage)
{
if (Width != Image.Width ||
Height != Image.Height ||
Format != Image.Format ||
if (Width != NewImage.Width ||
Height != NewImage.Height ||
Format != NewImage.Format ||
!Initialized)
{
(PixelInternalFormat InternalFormat, PixelFormat PixelFormat, PixelType PixelType) =
OGLEnumConverter.GetImageFormat(Image.Format);
OGLEnumConverter.GetImageFormat(NewImage.Format);
GL.BindTexture(TextureTarget.Texture2D, Handle);
@ -58,12 +55,10 @@ namespace Ryujinx.Graphics.Gal.OpenGL
CopyBuffer = GL.GenBuffer();
}
int MaxWidth = Math.Max(Image.Width, Width);
int MaxHeight = Math.Max(Image.Height, Height);
int CurrentSize = Math.Max(ImageTable.GetImageSize(NewImage),
ImageTable.GetImageSize(Image));
int CurrentSize = MaxWidth * MaxHeight * MaxBpp;
GL.BindBuffer(BufferTarget.PixelPackBuffer, CopyBuffer);
GL.BindBuffer(BufferTarget.PixelPackBuffer, CopyBuffer);
GL.BindBuffer(BufferTarget.PixelUnpackBuffer, CopyBuffer);
if (CopyBufferSize < CurrentSize)
@ -95,8 +90,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
TextureTarget.Texture2D,
Level,
InternalFormat,
Image.Width,
Image.Height,
NewImage.Width,
NewImage.Height,
Border,
PixelFormat,
PixelType,
@ -104,11 +99,11 @@ namespace Ryujinx.Graphics.Gal.OpenGL
if (Initialized)
{
GL.BindBuffer(BufferTarget.PixelPackBuffer, 0);
GL.BindBuffer(BufferTarget.PixelPackBuffer, 0);
GL.BindBuffer(BufferTarget.PixelUnpackBuffer, 0);
}
this.Image = Image;
Image = NewImage;
this.InternalFormat = InternalFormat;
this.PixelFormat = PixelFormat;

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

@ -1,4 +1,5 @@
using OpenTK.Graphics.OpenGL;
using Ryujinx.Graphics.Texture;
using System;
namespace Ryujinx.Graphics.Gal.OpenGL
@ -379,7 +380,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
{
if (Texture.TryGetImage(Key, out ImageHandler Tex))
{
byte[] Data = new byte[Tex.Width * Tex.Height * ImageHandler.MaxBpp];
byte[] Data = new byte[ImageTable.GetImageSize(Tex.Image)];
GL.BindTexture(TextureTarget.Texture2D, Tex.Handle);