diff options
| author | 2015-09-29 22:00:27 -0400 | |
|---|---|---|
| committer | 2015-09-29 22:00:27 -0400 | |
| 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.gz yuzu-a67df5ad94b206c2f2377ba90173f5f1fbd9d74e.tar.xz yuzu-a67df5ad94b206c2f2377ba90173f5f1fbd9d74e.zip | |
Merge pull request #1172 from martinlindhe/fix-warnings
Fix some xcode 7 (llvm) warnings
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: | |||
| 45 | 45 | ||
| 46 | private: | 46 | private: |
| 47 | GraphicsDebugger* observed; | 47 | GraphicsDebugger* observed; |
| 48 | bool in_destruction; | ||
| 49 | 48 | ||
| 50 | friend class GraphicsDebugger; | 49 | friend class GraphicsDebugger; |
| 51 | }; | 50 | }; |
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, | |||
| 967 | UNIMPLEMENTED(); | 967 | UNIMPLEMENTED(); |
| 968 | break; | 968 | break; |
| 969 | } | 969 | } |
| 970 | |||
| 971 | return {}; | ||
| 970 | }; | 972 | }; |
| 971 | 973 | ||
| 972 | auto LookupFactorA = [&](Regs::BlendFactor factor) -> u8 { | 974 | auto LookupFactorA = [&](Regs::BlendFactor factor) -> u8 { |
| @@ -1000,6 +1002,8 @@ static void ProcessTriangleInternal(const Shader::OutputVertex& v0, | |||
| 1000 | UNIMPLEMENTED(); | 1002 | UNIMPLEMENTED(); |
| 1001 | break; | 1003 | break; |
| 1002 | } | 1004 | } |
| 1005 | |||
| 1006 | return {}; | ||
| 1003 | }; | 1007 | }; |
| 1004 | 1008 | ||
| 1005 | static auto EvaluateBlendEquation = [](const Math::Vec4<u8>& src, const Math::Vec4<u8>& srcfactor, | 1009 | 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: | |||
| 62 | const TextureInfo& texture); | 62 | const TextureInfo& texture); |
| 63 | 63 | ||
| 64 | EmuWindow* render_window; ///< Handle to render window | 64 | EmuWindow* render_window; ///< Handle to render window |
| 65 | u32 last_mode; ///< Last render mode | ||
| 66 | 65 | ||
| 67 | int resolution_width; ///< Current resolution width | 66 | int resolution_width; ///< Current resolution width |
| 68 | int resolution_height; ///< Current resolution height | 67 | int resolution_height; ///< Current resolution height |