diff options
author | bunnei <bunneidev@gmail.com> | 2018-04-06 17:07:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-06 17:07:28 +0200 |
commit | 37041ea12ccfc95013817ecb08319ad31b844a9a (patch) | |
tree | 62639491af6cf33db16464fbf797270c19e2c8fa | |
parent | core, main.h: Abort on 32Bit ROMs (#309) (diff) | |
parent | rasterizer_interface.h: Update from citra to yuzu (diff) | |
download | yuzu-37041ea12ccfc95013817ecb08319ad31b844a9a.tar yuzu-37041ea12ccfc95013817ecb08319ad31b844a9a.tar.gz yuzu-37041ea12ccfc95013817ecb08319ad31b844a9a.tar.bz2 yuzu-37041ea12ccfc95013817ecb08319ad31b844a9a.tar.lz yuzu-37041ea12ccfc95013817ecb08319ad31b844a9a.tar.xz yuzu-37041ea12ccfc95013817ecb08319ad31b844a9a.tar.zst yuzu-37041ea12ccfc95013817ecb08319ad31b844a9a.zip |
-rw-r--r-- | src/video_core/rasterizer_interface.h | 6 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 2 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.h | 6 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.h | 4 | ||||
-rw-r--r-- | src/yuzu_cmd/default_ini.h | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/video_core/rasterizer_interface.h b/src/video_core/rasterizer_interface.h index 8239f9aad..35d262189 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; diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 2ffbd3bab..4fd7cdf6a 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, diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h index 1f660d30c..37b1dae80 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 diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index fffd0f9f4..c52f40037 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<float> display_texcoords; diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index 895a42c39..02254403d 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 |