summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorMartin Lindhe <martin@ubique.se>2015-09-25 14:33:39 +0200
committerMartin Lindhe <martin@ubique.se>2015-09-29 23:11:09 +0200
commitbafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481 (patch)
tree75060eef7ea204ed8c82b732bdd4ca61fe034a32 /src/video_core
parentMerge pull request #1160 from lioncash/clang (diff)
downloadyuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.tar
yuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.tar.gz
yuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.tar.bz2
yuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.tar.lz
yuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.tar.xz
yuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.tar.zst
yuzu-bafb7afba2d07b0ee2e7ecd4fb8e6a699cebc481.zip
Diffstat (limited to '')
-rw-r--r--src/video_core/gpu_debugger.h1
-rw-r--r--src/video_core/rasterizer.cpp4
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.h1
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