Vulkan: When deriving stencilref from color, don't forget to update t…

…he value. Plus minor cleanups.
hrydgard · Nov 12, 2017 · 232e30f · unknownbrackets · Nov 12, 2017 · hrydgard
1 parent ac78b90
commit 232e30f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/GPU/Vulkan/DrawEngineVulkan.cpp b/GPU/Vulkan/DrawEngineVulkan.cpp
@@ -997,6 +997,8 @@ void DrawEngineVulkan::DoFlush() {
 					}
 					lastPipeline_ = pipeline;
 				}
+				if (result.setStencil)
+					dynState_.stencilRef = result.stencilValue;
 				ApplyDrawStateLate(renderManager, false, 0, pipeline->useBlendConstant);
 				gstate_c.Clean(DIRTY_BLEND_STATE | DIRTY_DEPTHSTENCIL_STATE | DIRTY_RASTER_STATE | DIRTY_VIEWPORTSCISSOR_STATE);
 				lastPipeline_ = pipeline;

diff --git a/GPU/Vulkan/FramebufferVulkan.cpp b/GPU/Vulkan/FramebufferVulkan.cpp
@@ -362,7 +362,6 @@ void FramebufferManagerVulkan::BindPostShader(const PostShaderUniforms &uniforms
 	}
 
 	postShaderUniforms_ = uniforms;
-	// VulkanRenderManager *renderManager = (VulkanRenderManager *)draw_->GetNativeObject(Draw::NativeObject::RENDER_MANAGER);
 	cur2DPipeline_ = pipelinePostShader_;
 
 	gstate_c.Dirty(DIRTY_VERTEXSHADER_STATE);

diff --git a/ext/native/base/logging.h b/ext/native/base/logging.h
@@ -88,7 +88,8 @@ const char *GetFn(const char *fn);
 		OutputDebugStringUTF8(temp); \
 	} \
 } while (false)
-#define DUMPLOG(x) OutputDebugStringUTF8(x);
+
+#define DUMPLOG(x) OutputDebugStringUTF8(x)
 
 #ifdef _DEBUG
 #define DLOG(...) XLOG_IMPL("D", __VA_ARGS__)

diff --git a/ext/native/thin3d/VulkanQueueRunner.cpp b/ext/native/thin3d/VulkanQueueRunner.cpp
@@ -4,8 +4,6 @@
 
 // Debug help: adb logcat -s DEBUG PPSSPPNativeActivity PPSSPP
 
-// TODO: This is only enough for 4x render resolution / 4x texture upscale for debugger.
-// Maybe we should use a dynamically allocated one for larger?
 void VulkanQueueRunner::CreateDeviceObjects() {
 	ILOG("VulkanQueueRunner::CreateDeviceObjects");
 	InitBackbufferRenderPass();