diff options
author | bunnei <bunneidev@gmail.com> | 2015-09-30 04:00:27 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-09-30 04:00:27 +0200 |
commit | a67df5ad94b206c2f2377ba90173f5f1fbd9d74e (patch) | |
tree | e6fddc8bf18920a672de751a834effe0683a1d25 /src/video_core | |
parent | Merge pull request #1171 from LittleWhite-tb/qt-no-refresh-nologo (diff) | |
parent | fix some xcode 7.0 warnings (diff) | |
download | yuzu-a67df5ad94b206c2f2377ba90173f5f1fbd9d74e.tar yuzu-a67df5ad94b206c2f2377ba90173f5f1fbd9d74e.tar.gz yuzu-a67df5ad94b206c2f2377ba90173f5f1fbd9d74e.tar.bz2 yuzu-a67df5ad94b206c2f2377ba90173f5f1fbd9d74e.tar.lz yuzu-a67df5ad94b206c2f2377ba90173f5f1fbd9d74e.tar.xz yuzu-a67df5ad94b206c2f2377ba90173f5f1fbd9d74e.tar.zst yuzu-a67df5ad94b206c2f2377ba90173f5f1fbd9d74e.zip |
Diffstat (limited to 'src/video_core')
-rw-r--r-- | src/video_core/gpu_debugger.h | 1 | ||||
-rw-r--r-- | src/video_core/rasterizer.cpp | 4 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/video_core/gpu_debugger.h b/src/video_core/gpu_debugger.h index fae5de7d1..a3aab216c 100644 --- a/src/video_core/gpu_debugger.h +++ b/src/video_core/gpu_debugger.h @@ -45,7 +45,6 @@ public: private: GraphicsDebugger* observed; - bool in_destruction; friend class GraphicsDebugger; }; diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp index 6e2266b1c..7abf60292 100644 --- a/src/video_core/rasterizer.cpp +++ b/src/video_core/rasterizer.cpp @@ -967,6 +967,8 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, UNIMPLEMENTED(); break; } + + return {}; }; auto LookupFactorA = [&](Regs::BlendFactor factor) -> u8 { @@ -1000,6 +1002,8 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, UNIMPLEMENTED(); break; } + + return {}; }; static auto EvaluateBlendEquation = [](const Math::Vec4<u8>& src, const Math::Vec4<u8>& srcfactor, diff --git a/src/video_core/renderer_opengl/renderer_opengl.h b/src/video_core/renderer_opengl/renderer_opengl.h index 5677e538b..b42df7654 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.h +++ b/src/video_core/renderer_opengl/renderer_opengl.h @@ -62,7 +62,6 @@ private: const TextureInfo& texture); EmuWindow* render_window; ///< Handle to render window - u32 last_mode; ///< Last render mode int resolution_width; ///< Current resolution width int resolution_height; ///< Current resolution height |