Просмотр исходного кода

Merge pull request #310 from N00byKing/patch-1

Update multiple comments from citra to yuzu
bunnei 8 лет назад
Родитель
Сommit
37041ea12c

+ 3 - 3
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;
 

+ 1 - 1
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,

+ 3 - 3
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

+ 2 - 2
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<float> display_texcoords;

+ 1 - 1
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