Vulkan: Fix Prescale UV

GPU/GLES/TransformPipeline.cpp

@@ -121,14 +121,14 @@ TransformDrawEngine::TransformDrawEngine()
 	: decodedVerts_(0),
 		prevPrim_(GE_PRIM_INVALID),
 		lastVType_(-1),
-		shaderManager_(0),
+		shaderManager_(nullptr),
-		textureCache_(0),
+		textureCache_(nullptr),
-		framebufferManager_(0),
+		framebufferManager_(nullptr),
 		numDrawCalls(0),
 		vertexCountInDrawCalls(0),
 		decodeCounter_(0),
 		dcid_(0),
-		uvScale(0),
+		uvScale(nullptr),
 		fboTexNeedBind_(false),
 		fboTexBound_(false) {
 	decimationCounter_ = VERTEXCACHE_DECIMATION_INTERVAL;

GPU/Vulkan/DrawEngineVulkan.cpp

@@ -71,6 +71,7 @@ DrawEngineVulkan::DrawEngineVulkan(VulkanContext *vulkan)
 	framebufferManager_(nullptr),
 	numDrawCalls(0),
 	vertexCountInDrawCalls(0),
+	uvScale(nullptr),
 	fboTexNeedBind_(false),
 	fboTexBound_(false),
 	curFrame_(0),
@@ -92,6 +93,10 @@ DrawEngineVulkan::DrawEngineVulkan(VulkanContext *vulkan)
 
 	indexGen.Setup(decIndex);
 
+	if (g_Config.bPrescaleUV) {
+		uvScale = new UVScale[MAX_DEFERRED_DRAW_CALLS];
+	}
+
 	// All resources we need for PSP drawing. Usually only bindings 0 and 2-4 are populated.
 	VkDescriptorSetLayoutBinding bindings[5];
 	bindings[0].descriptorCount = 1;
@@ -202,6 +207,7 @@ DrawEngineVulkan::~DrawEngineVulkan() {
 		nullTexture_->Destroy();
 		delete nullTexture_;
 	}
+	delete[] uvScale;
 }
 
 void DrawEngineVulkan::BeginFrame() {
@@ -312,6 +318,10 @@ void DrawEngineVulkan::SubmitPrim(void *verts, void *inds, GEPrimitiveType prim,
 		dc.indexUpperBound = vertexCount - 1;
 	}
 
+	if (uvScale) {
+		uvScale[numDrawCalls] = gstate_c.uv;
+	}
+
 	numDrawCalls++;
 	vertexCountInDrawCalls += vertexCount;
 
@@ -324,26 +334,7 @@ void DrawEngineVulkan::SubmitPrim(void *verts, void *inds, GEPrimitiveType prim,
 	}
 }
 
-void DrawEngineVulkan::DecodeVerts(VulkanPushBuffer *push, uint32_t *bindOffset, VkBuffer *vkbuf) {
+void DrawEngineVulkan::DecodeVertsStep(u8 *dest, int &i, int &decodedVerts) {
-	int decodedVerts = 0;
-
-	u8 *dest = decoded;
-
-	// Figure out how much pushbuffer space we need to allocate.
-	if (push) {
-		int vertsToDecode = 0;
-		for (int i = 0; i < numDrawCalls; i++) {
-			const DeferredDrawCall &dc = drawCalls[i];
-			if (dc.indexType == GE_VTYPE_IDX_NONE >> GE_VTYPE_IDX_SHIFT) {
-				vertsToDecode += dc.indexUpperBound - dc.indexLowerBound + 1;
-			} else {
-				vertsToDecode += dc.vertexCount;
-			}
-		}
-		dest = (u8 *)push->Push(vertsToDecode * dec_->GetDecVtxFmt().stride, bindOffset, vkbuf);
-	}
-
-	for (int i = 0; i < numDrawCalls; i++) {
 	const DeferredDrawCall &dc = drawCalls[i];
 
 	indexGen.SetIndex(decodedVerts);
@@ -405,7 +396,40 @@ void DrawEngineVulkan::DecodeVerts(VulkanPushBuffer *push, uint32_t *bindOffset,
 		indexGen.Advance(vertexCount);
 		i = lastMatch;
 	}
+}
+
+void DrawEngineVulkan::DecodeVerts(VulkanPushBuffer *push, uint32_t *bindOffset, VkBuffer *vkbuf) {
+	int decodedVerts = 0;
+
+	u8 *dest = decoded;
+
+	// Figure out how much pushbuffer space we need to allocate.
+	if (push) {
+		int vertsToDecode = 0;
+		for (int i = 0; i < numDrawCalls; i++) {
+			const DeferredDrawCall &dc = drawCalls[i];
+			if (dc.indexType == GE_VTYPE_IDX_NONE >> GE_VTYPE_IDX_SHIFT) {
+				vertsToDecode += dc.indexUpperBound - dc.indexLowerBound + 1;
+			} else {
+				vertsToDecode += dc.vertexCount;
 			}
+		}
+		dest = (u8 *)push->Push(vertsToDecode * dec_->GetDecVtxFmt().stride, bindOffset, vkbuf);
+	}
+
+	if (uvScale) {
+		const UVScale origUV = gstate_c.uv;
+		for (int i = 0; i < numDrawCalls; i++) {
+			gstate_c.uv = uvScale[i];
+			DecodeVertsStep(dest, i, decodedVerts);  // Note that this can modify i
+		}
+		gstate_c.uv = origUV;
+	} else {
+		for (int i = 0; i < numDrawCalls; i++) {
+			DecodeVertsStep(dest, i, decodedVerts);  // Note that this can modify i
+		}
+	}
+
 	// Sanity check
 	if (indexGen.Prim() < 0) {
 		ERROR_LOG_REPORT(G3D, "DecodeVerts: Failed to deduce prim: %i", indexGen.Prim());

GPU/Vulkan/DrawEngineVulkan.h

@@ -147,6 +147,8 @@ private:
 	struct FrameData;
 
 	void DecodeVerts(VulkanPushBuffer *push, uint32_t *bindOffset, VkBuffer *vkbuf);
+	void DecodeVertsStep(u8 *dest, int &i, int &decodedVerts);
+
 	void DoFlush(VkCommandBuffer cmd);
 	void UpdateUBOs(FrameData *frame);
 
@@ -244,6 +246,7 @@ private:
 	DeferredDrawCall drawCalls[MAX_DEFERRED_DRAW_CALLS];
 	int numDrawCalls;
 	int vertexCountInDrawCalls;
+	UVScale *uvScale;
 
 	bool fboTexNeedBind_;
 	bool fboTexBound_;

UI/GameSettingsScreen.cpp

@@ -311,6 +311,9 @@ void GameSettingsScreen::CreateViews() {
 	CheckBox *depthWrite = graphicsSettings->Add(new CheckBox(&g_Config.bAlwaysDepthWrite, gr->T("Always Depth Write")));
 	depthWrite->SetDisabledPtr(&g_Config.bSoftwareRendering);
 
+	graphicsSettings->Add(new CheckBox(&g_Config.bPrescaleUV, gr->T("Texture Coord Speedhack")));
+	depthWrite->SetDisabledPtr(&g_Config.bSoftwareRendering);
+
 	static const char *bloomHackOptions[] = { "Off", "Safe", "Balanced", "Aggressive" };
 	PopupMultiChoice *bloomHack = graphicsSettings->Add(new PopupMultiChoice(&g_Config.iBloomHack, gr->T("Lower resolution for effects (reduces artifacts)"), bloomHackOptions, 0, ARRAY_SIZE(bloomHackOptions), gr->GetName(), screenManager()));
 	bloomHackEnable_ = !g_Config.bSoftwareRendering && (g_Config.iInternalResolution != 1);