From ca17f581f59364ff54a5b8a220e3fef46795fe77 Mon Sep 17 00:00:00 2001 From: N00byKing Date: Wed, 4 Apr 2018 23:03:02 +0200 Subject: [PATCH 1/5] renderer_opengl.h: Update from citra to yuzu --- src/video_core/renderer_opengl/renderer_opengl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index fffd0f9f4b..c52f40037a 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h @@ -14,7 +14,7 @@ class EmuWindow; -/// Structure used for storing information about the textures for each 3DS screen +/// Structure used for storing information about the textures for the Switch screen struct TextureInfo { OGLTexture resource; GLsizei width; @@ -24,7 +24,7 @@ struct TextureInfo { Tegra::FramebufferConfig::PixelFormat pixel_format; }; -/// Structure used for storing information about the display target for each 3DS screen +/// Structure used for storing information about the display target for the Switch screen struct ScreenInfo { GLuint display_texture; MathUtil::Rectangle display_texcoords; From cfc28e0c1ad8321525c3f2fa26ece3a95ad9dfd0 Mon Sep 17 00:00:00 2001 From: N00byKing Date: Wed, 4 Apr 2018 23:04:24 +0200 Subject: [PATCH 2/5] gl_rasterizer_cache.h: Update from citra to yuzu --- src/video_core/renderer_opengl/gl_rasterizer_cache.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h index 1f660d30c6..37b1dae803 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h @@ -303,12 +303,12 @@ public: void CopySurface(const Surface& src_surface, const Surface& dst_surface, SurfaceInterval copy_interval); - /// Load a texture from 3DS memory to OpenGL and cache it (if not already cached) + /// Load a texture from Switch memory to OpenGL and cache it (if not already cached) Surface GetSurface(const SurfaceParams& params, ScaleMatch match_res_scale, bool load_if_create); /// Attempt to find a subrect (resolution scaled) of a surface, otherwise loads a texture from - /// 3DS memory to OpenGL and caches it (if not already cached) + /// Switch memory to OpenGL and caches it (if not already cached) SurfaceRect_Tuple GetSurfaceSubRect(const SurfaceParams& params, ScaleMatch match_res_scale, bool load_if_create); @@ -328,7 +328,7 @@ public: /// Write any cached resources overlapping the region back to memory (if dirty) void FlushRegion(VAddr addr, u64 size, Surface flush_surface = nullptr); - /// Mark region as being invalidated by region_owner (nullptr if 3DS memory) + /// Mark region as being invalidated by region_owner (nullptr if Switch memory) void InvalidateRegion(VAddr addr, u64 size, const Surface& region_owner); /// Flush all cached resources tracked by this cache manager From 27dbbd8227539c41c9658e767b3ca4e93a92cbbd Mon Sep 17 00:00:00 2001 From: N00byKing Date: Wed, 4 Apr 2018 23:05:10 +0200 Subject: [PATCH 3/5] gl_rasterizer_cache.cpp: Update from citra to yuzu --- src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 2ffbd3bab4..4fd7cdf6ac 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -1261,7 +1261,7 @@ void RasterizerCacheOpenGL::ValidateSurface(const Surface& surface, VAddr addr, } } - // Load data from 3DS memory + // Load data from Switch memory FlushRegion(params.addr, params.size); surface->LoadGLBuffer(params.addr, params.end); surface->UploadGLTexture(surface->GetSubRect(params), read_framebuffer.handle, From 1f37dd02ce2b3c93915cc05e3715fc71da6e00d5 Mon Sep 17 00:00:00 2001 From: N00byKing Date: Wed, 4 Apr 2018 23:05:51 +0200 Subject: [PATCH 4/5] default_ini.h: Update from citra to yuzu --- src/yuzu_cmd/default_ini.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 895a42c39f..02254403d8 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -8,7 +8,7 @@ namespace DefaultINI { const char* sdl2_config_file = R"( [Controls] -# The input devices and parameters for each 3DS native input +# The input devices and parameters for each Switch native input # It should be in the format of "engine:[engine_name],[param1]:[value1],[param2]:[value2]..." # Escape characters $0 (for ':'), $1 (for ',') and $2 (for '$') can be used in values From d1d7582a5bd00ca6c63bc47c1da10910ec00f9c8 Mon Sep 17 00:00:00 2001 From: N00byKing Date: Wed, 4 Apr 2018 23:07:58 +0200 Subject: [PATCH 5/5] rasterizer_interface.h: Update from citra to yuzu --- src/video_core/rasterizer_interface.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.h index 8239f9aad5..35d2621898 100644 --- a/src/video_core/rasterizer_interface.h +++ b/src/video_core/rasterizer_interface.h @@ -21,16 +21,16 @@ public: /// Notify rasterizer that the specified Maxwell register has been changed virtual void NotifyMaxwellRegisterChanged(u32 id) = 0; - /// Notify rasterizer that all caches should be flushed to 3DS memory + /// Notify rasterizer that all caches should be flushed to Switch memory virtual void FlushAll() = 0; - /// Notify rasterizer that any caches of the specified region should be flushed to 3DS memory + /// Notify rasterizer that any caches of the specified region should be flushed to Switch memory virtual void FlushRegion(VAddr addr, u64 size) = 0; /// Notify rasterizer that any caches of the specified region should be invalidated virtual void InvalidateRegion(VAddr addr, u64 size) = 0; - /// Notify rasterizer that any caches of the specified region should be flushed to 3DS memory + /// Notify rasterizer that any caches of the specified region should be flushed to Switch memory /// and invalidated virtual void FlushAndInvalidateRegion(VAddr addr, u64 size) = 0;