summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar bunnei2018-01-20 19:12:21 -0500
committerGravatar GitHub2018-01-20 19:12:21 -0500
commit557b2496d7a83b26ad6737543a7da91826650fca (patch)
tree28c5d2fa3cba08f1f49f5c10fa16bfb94144d01c /src/video_core
parentMerge pull request #120 from Rozelette/master (diff)
parentTravis: Add missing PPA for newer libstdc++ (diff)
downloadyuzu-557b2496d7a83b26ad6737543a7da91826650fca.tar.gz
yuzu-557b2496d7a83b26ad6737543a7da91826650fca.tar.xz
yuzu-557b2496d7a83b26ad6737543a7da91826650fca.zip
Merge pull request #117 from jroweboy/clang-format
Clang format as a build target
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/renderer_opengl/gl_shader_util.h2
-rw-r--r--src/video_core/utils.h2
-rw-r--r--src/video_core/video_core.cpp2
-rw-r--r--src/video_core/video_core.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/gl_shader_util.h b/src/video_core/renderer_opengl/gl_shader_util.h
index c66e8acd3..a4bcffdfa 100644
--- a/src/video_core/renderer_opengl/gl_shader_util.h
+++ b/src/video_core/renderer_opengl/gl_shader_util.h
@@ -16,4 +16,4 @@ namespace GLShader {
16 */ 16 */
17GLuint LoadProgram(const char* vertex_shader, const char* fragment_shader); 17GLuint LoadProgram(const char* vertex_shader, const char* fragment_shader);
18 18
19} // namespace 19} // namespace GLShader
diff --git a/src/video_core/utils.h b/src/video_core/utils.h
index d8567f314..d94a10417 100644
--- a/src/video_core/utils.h
+++ b/src/video_core/utils.h
@@ -49,4 +49,4 @@ static inline u32 GetMortonOffset(u32 x, u32 y, u32 bytes_per_pixel) {
49 return (i + offset) * bytes_per_pixel; 49 return (i + offset) * bytes_per_pixel;
50} 50}
51 51
52} // namespace 52} // namespace VideoCore
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index 106d62562..864691baa 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -39,4 +39,4 @@ void Shutdown() {
39 LOG_DEBUG(Render, "shutdown OK"); 39 LOG_DEBUG(Render, "shutdown OK");
40} 40}
41 41
42} // namespace 42} // namespace VideoCore
diff --git a/src/video_core/video_core.h b/src/video_core/video_core.h
index 0b8785898..1fd90b9d0 100644
--- a/src/video_core/video_core.h
+++ b/src/video_core/video_core.h
@@ -31,4 +31,4 @@ bool Init(EmuWindow* emu_window);
31/// Shutdown the video core 31/// Shutdown the video core
32void Shutdown(); 32void Shutdown();
33 33
34} // namespace 34} // namespace VideoCore