summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-04-06 11:07:28 -0400
committerGravatar GitHub2018-04-06 11:07:28 -0400
commit37041ea12ccfc95013817ecb08319ad31b844a9a (patch)
tree62639491af6cf33db16464fbf797270c19e2c8fa /src
parentcore, main.h: Abort on 32Bit ROMs (#309) (diff)
parentrasterizer_interface.h: Update from citra to yuzu (diff)
downloadyuzu-37041ea12ccfc95013817ecb08319ad31b844a9a.tar.gz
yuzu-37041ea12ccfc95013817ecb08319ad31b844a9a.tar.xz
yuzu-37041ea12ccfc95013817ecb08319ad31b844a9a.zip
Merge pull request #310 from N00byKing/patch-1
Update multiple comments from citra to yuzu
Diffstat (limited to 'src')
-rw-r--r--src/video_core/rasterizer_interface.h6
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.cpp2
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.h6
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.h4
-rw-r--r--src/yuzu_cmd/default_ini.h2
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:
21 /// Notify rasterizer that the specified Maxwell register has been changed 21 /// Notify rasterizer that the specified Maxwell register has been changed
22 virtual void NotifyMaxwellRegisterChanged(u32 id) = 0; 22 virtual void NotifyMaxwellRegisterChanged(u32 id) = 0;
23 23
24 /// Notify rasterizer that all caches should be flushed to 3DS memory 24 /// Notify rasterizer that all caches should be flushed to Switch memory
25 virtual void FlushAll() = 0; 25 virtual void FlushAll() = 0;
26 26
27 /// Notify rasterizer that any caches of the specified region should be flushed to 3DS memory 27 /// Notify rasterizer that any caches of the specified region should be flushed to Switch memory
28 virtual void FlushRegion(VAddr addr, u64 size) = 0; 28 virtual void FlushRegion(VAddr addr, u64 size) = 0;
29 29
30 /// Notify rasterizer that any caches of the specified region should be invalidated 30 /// Notify rasterizer that any caches of the specified region should be invalidated
31 virtual void InvalidateRegion(VAddr addr, u64 size) = 0; 31 virtual void InvalidateRegion(VAddr addr, u64 size) = 0;
32 32
33 /// Notify rasterizer that any caches of the specified region should be flushed to 3DS memory 33 /// Notify rasterizer that any caches of the specified region should be flushed to Switch memory
34 /// and invalidated 34 /// and invalidated
35 virtual void FlushAndInvalidateRegion(VAddr addr, u64 size) = 0; 35 virtual void FlushAndInvalidateRegion(VAddr addr, u64 size) = 0;
36 36
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,
1261 } 1261 }
1262 } 1262 }
1263 1263
1264 // Load data from 3DS memory 1264 // Load data from Switch memory
1265 FlushRegion(params.addr, params.size); 1265 FlushRegion(params.addr, params.size);
1266 surface->LoadGLBuffer(params.addr, params.end); 1266 surface->LoadGLBuffer(params.addr, params.end);
1267 surface->UploadGLTexture(surface->GetSubRect(params), read_framebuffer.handle, 1267 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:
303 void CopySurface(const Surface& src_surface, const Surface& dst_surface, 303 void CopySurface(const Surface& src_surface, const Surface& dst_surface,
304 SurfaceInterval copy_interval); 304 SurfaceInterval copy_interval);
305 305
306 /// Load a texture from 3DS memory to OpenGL and cache it (if not already cached) 306 /// Load a texture from Switch memory to OpenGL and cache it (if not already cached)
307 Surface GetSurface(const SurfaceParams& params, ScaleMatch match_res_scale, 307 Surface GetSurface(const SurfaceParams& params, ScaleMatch match_res_scale,
308 bool load_if_create); 308 bool load_if_create);
309 309
310 /// Attempt to find a subrect (resolution scaled) of a surface, otherwise loads a texture from 310 /// Attempt to find a subrect (resolution scaled) of a surface, otherwise loads a texture from
311 /// 3DS memory to OpenGL and caches it (if not already cached) 311 /// Switch memory to OpenGL and caches it (if not already cached)
312 SurfaceRect_Tuple GetSurfaceSubRect(const SurfaceParams& params, ScaleMatch match_res_scale, 312 SurfaceRect_Tuple GetSurfaceSubRect(const SurfaceParams& params, ScaleMatch match_res_scale,
313 bool load_if_create); 313 bool load_if_create);
314 314
@@ -328,7 +328,7 @@ public:
328 /// Write any cached resources overlapping the region back to memory (if dirty) 328 /// Write any cached resources overlapping the region back to memory (if dirty)
329 void FlushRegion(VAddr addr, u64 size, Surface flush_surface = nullptr); 329 void FlushRegion(VAddr addr, u64 size, Surface flush_surface = nullptr);
330 330
331 /// Mark region as being invalidated by region_owner (nullptr if 3DS memory) 331 /// Mark region as being invalidated by region_owner (nullptr if Switch memory)
332 void InvalidateRegion(VAddr addr, u64 size, const Surface& region_owner); 332 void InvalidateRegion(VAddr addr, u64 size, const Surface& region_owner);
333 333
334 /// Flush all cached resources tracked by this cache manager 334 /// 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 @@
14 14
15class EmuWindow; 15class EmuWindow;
16 16
17/// Structure used for storing information about the textures for each 3DS screen 17/// Structure used for storing information about the textures for the Switch screen
18struct TextureInfo { 18struct TextureInfo {
19 OGLTexture resource; 19 OGLTexture resource;
20 GLsizei width; 20 GLsizei width;
@@ -24,7 +24,7 @@ struct TextureInfo {
24 Tegra::FramebufferConfig::PixelFormat pixel_format; 24 Tegra::FramebufferConfig::PixelFormat pixel_format;
25}; 25};
26 26
27/// Structure used for storing information about the display target for each 3DS screen 27/// Structure used for storing information about the display target for the Switch screen
28struct ScreenInfo { 28struct ScreenInfo {
29 GLuint display_texture; 29 GLuint display_texture;
30 MathUtil::Rectangle<float> display_texcoords; 30 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 {
8 8
9const char* sdl2_config_file = R"( 9const char* sdl2_config_file = R"(
10[Controls] 10[Controls]
11# The input devices and parameters for each 3DS native input 11# The input devices and parameters for each Switch native input
12# It should be in the format of "engine:[engine_name],[param1]:[value1],[param2]:[value2]..." 12# It should be in the format of "engine:[engine_name],[param1]:[value1],[param2]:[value2]..."
13# Escape characters $0 (for ':'), $1 (for ',') and $2 (for '$') can be used in values 13# Escape characters $0 (for ':'), $1 (for ',') and $2 (for '$') can be used in values
14 14