diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2018-08-15 15:59:51 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 15:59:51 -0300 |
| commit | c393cdf8e3775bc95850e4d8c8e4c446b286d3b4 (patch) | |
| tree | 25035a244741d2daf3f7d6be8b23153ff061ea15 /Ryujinx.Graphics/Gal/OpenGL/OGLShader.cs | |
| parent | 76d95dee05e3c51c18e1799f54cc407e0f633b4e (diff) | |
More flexible memory manager (#307)
* Keep track mapped buffers with fixed offsets
* Started rewriting the memory manager
* Initial support for MapPhysicalMemory and UnmapPhysicalMemory, other tweaks
* MapPhysicalMemory/UnmapPhysicalMemory support, other tweaks
* Rebased
* Optimize the map/unmap physical memory svcs
* Integrate shared font support
* Fix address space reserve alignment
* Some fixes related to gpu memory mapping
* Some cleanup
* Only try uploading const buffers that are really used
* Check if memory region is contiguous
* Rebased
* Add missing count increment on IsRegionModified
* Check for reads/writes outside of the address space, optimize translation with a tail call
Diffstat (limited to 'Ryujinx.Graphics/Gal/OpenGL/OGLShader.cs')
| -rw-r--r-- | Ryujinx.Graphics/Gal/OpenGL/OGLShader.cs | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Ryujinx.Graphics/Gal/OpenGL/OGLShader.cs b/Ryujinx.Graphics/Gal/OpenGL/OGLShader.cs index 4792bc5e..9c7b8668 100644 --- a/Ryujinx.Graphics/Gal/OpenGL/OGLShader.cs +++ b/Ryujinx.Graphics/Gal/OpenGL/OGLShader.cs @@ -72,8 +72,18 @@ namespace Ryujinx.Graphics.Gal.OpenGL return new OGLShaderStage( Type, Program.Code, - Program.Textures, - Program.Uniforms); + Program.Uniforms, + Program.Textures); + } + + public IEnumerable<ShaderDeclInfo> GetConstBufferUsage(long Key) + { + if (Stages.TryGetValue(Key, out OGLShaderStage Stage)) + { + return Stage.ConstBufferUsage; + } + + return Enumerable.Empty<ShaderDeclInfo>(); } public IEnumerable<ShaderDeclInfo> GetTextureUsage(long Key) @@ -224,7 +234,7 @@ namespace Ryujinx.Graphics.Gal.OpenGL { if (Stage != null) { - foreach (ShaderDeclInfo DeclInfo in Stage.UniformUsage) + foreach (ShaderDeclInfo DeclInfo in Stage.ConstBufferUsage) { int BlockIndex = GL.GetUniformBlockIndex(ProgramHandle, DeclInfo.Name); |
