diff options
author | FernandoS27 <fsahmkow27@gmail.com> | 2018-10-13 04:06:04 +0200 |
---|---|---|
committer | FernandoS27 <fsahmkow27@gmail.com> | 2018-12-09 22:22:29 +0100 |
commit | 7b9c982d297f15c9fc30cd0cd68508b7df46cf45 (patch) | |
tree | 609853b36f20ed8f8a180483ed94c7a2ec886ac2 /src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | |
parent | Merge pull request #1868 from lioncash/config (diff) | |
download | yuzu-7b9c982d297f15c9fc30cd0cd68508b7df46cf45.tar yuzu-7b9c982d297f15c9fc30cd0cd68508b7df46cf45.tar.gz yuzu-7b9c982d297f15c9fc30cd0cd68508b7df46cf45.tar.bz2 yuzu-7b9c982d297f15c9fc30cd0cd68508b7df46cf45.tar.lz yuzu-7b9c982d297f15c9fc30cd0cd68508b7df46cf45.tar.xz yuzu-7b9c982d297f15c9fc30cd0cd68508b7df46cf45.tar.zst yuzu-7b9c982d297f15c9fc30cd0cd68508b7df46cf45.zip |
Diffstat (limited to 'src/video_core/renderer_opengl/gl_rasterizer_cache.cpp')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 5f4cdd119..cfc0dae29 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -107,6 +107,7 @@ std::size_t SurfaceParams::InnerMemorySize(bool force_gl, bool layer_only, params.height = Common::AlignUp(config.tic.Height(), GetCompressionFactor(params.pixel_format)); params.unaligned_height = config.tic.Height(); params.target = SurfaceTargetFromTextureType(config.tic.texture_type); + params.identity = SurfaceClass::Uploaded; switch (params.target) { case SurfaceTarget::Texture1D: @@ -173,6 +174,7 @@ std::size_t SurfaceParams::InnerMemorySize(bool force_gl, bool layer_only, params.height = config.height; params.unaligned_height = config.height; params.target = SurfaceTarget::Texture2D; + params.identity = SurfaceClass::RenderTarget; params.depth = 1; params.max_mip_level = 1; params.is_layered = false; @@ -208,6 +210,7 @@ std::size_t SurfaceParams::InnerMemorySize(bool force_gl, bool layer_only, params.height = zeta_height; params.unaligned_height = zeta_height; params.target = SurfaceTarget::Texture2D; + params.identity = SurfaceClass::DepthBuffer; params.depth = 1; params.max_mip_level = 1; params.is_layered = false; @@ -236,6 +239,7 @@ std::size_t SurfaceParams::InnerMemorySize(bool force_gl, bool layer_only, params.height = config.height; params.unaligned_height = config.height; params.target = SurfaceTarget::Texture2D; + params.identity = SurfaceClass::Copy; params.depth = 1; params.max_mip_level = 1; params.rt = {}; @@ -560,8 +564,7 @@ CachedSurface::CachedSurface(const SurfaceParams& params) glTexParameterf(SurfaceTargetToGL(params.target), GL_TEXTURE_LOD_BIAS, 1000.0); } - LabelGLObject(GL_TEXTURE, texture.handle, params.addr, - SurfaceParams::SurfaceTargetName(params.target)); + OpenGL::LabelGLObject(GL_TEXTURE, texture.handle, params.addr, params.IdentityString()); // Clamp size to mapped GPU memory region // TODO(bunnei): Super Mario Odyssey maps a 0x40000 byte region and then uses it for a 0x80000 |