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

Add Texture 1D support

Browse source
This commit is contained in:
Thog 2018-12-04 20:32:09 +01:00
commit 72a963ee9d
No known key found for this signature in database
GPG key ID: 0CD291558FAFDBC6
1 changed files with 36 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,6 +62,18 @@ namespace Ryujinx.Graphics.Gal.OpenGL
switch (Target) switch (Target)
{ {
case TextureTarget.Texture1D:
GL.TexImage1D(
Target,
Level,
InternalFmt,
Image.Width,
Border,
Format,
Type,
IntPtr.Zero);
break;
case TextureTarget.Texture2D: case TextureTarget.Texture2D:
GL.TexImage2D( GL.TexImage2D(
Target, Target,
@ -107,22 +119,8 @@ namespace Ryujinx.Graphics.Gal.OpenGL
} }
break; break;
default: default:
Logger.PrintWarning(LogClass.Gpu, $"Unsupported texture target type: {Target}"); throw new InvalidOperationException($"Unsupported texture target type: {Target}");
throw new InvalidOperationException();
GL.TexImage2D(
TextureTarget.Texture2D,
Level,
InternalFmt,
Image.Width,
Image.Height,
Border,
Format,
Type,
IntPtr.Zero);
break;
} }
} }
public void Create(long Key, byte[] Data, GalImage Image) public void Create(long Key, byte[] Data, GalImage Image)
@ -146,6 +144,16 @@ namespace Ryujinx.Graphics.Gal.OpenGL
switch (Target) switch (Target)
{ {
case TextureTarget.Texture1D:
GL.CompressedTexImage1D(
Target,
Level,
InternalFmt,
Image.Width,
Border,
Data.Length,
Data);
break;
case TextureTarget.Texture2D: case TextureTarget.Texture2D:
GL.CompressedTexImage2D( GL.CompressedTexImage2D(
Target, Target,
@ -201,18 +209,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
Data); Data);
break; break;
default: default:
Logger.PrintWarning(LogClass.Gpu, $"Unsupported texture target type: {Target}"); throw new InvalidOperationException($"Unsupported texture target type: {Target}");
throw new InvalidOperationException();
GL.CompressedTexImage2D(
TextureTarget.Texture2D,
Level,
InternalFmt,
Image.Width,
Image.Height,
Border,
Data.Length,
Data);
break;
} }
} }
else else
@ -243,6 +240,17 @@ namespace Ryujinx.Graphics.Gal.OpenGL
switch (Target) switch (Target)
{ {
case TextureTarget.Texture1D:
GL.TexImage1D(
Target,
Level,
InternalFmt,
Image.Width,
Border,
Format,
Type,
Data);
break;
case TextureTarget.Texture2D: case TextureTarget.Texture2D:
GL.TexImage2D( GL.TexImage2D(
Target, Target,
@ -289,19 +297,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL
} }
break; break;
default: default:
Logger.PrintWarning(LogClass.Gpu, $"Unsupported texture target type: {Target}"); throw new InvalidOperationException($"Unsupported texture target type: {Target}");
throw new InvalidOperationException();
GL.TexImage2D(
TextureTarget.Texture2D,
Level,
InternalFmt,
Image.Width,
Image.Height,
Border,
Format,
Type,
Data);
break;
} }
} }
} }