diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp b/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp
index 41407a7d03..52da134c03 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp
@@ -154,6 +154,17 @@ void D3D12GSRender::upload_and_bind_scale_offset_matrix(size_t descriptorIndex)
 	float alpha_ref = (float&)rsx::method_registers[NV4097_SET_ALPHA_REF];
 	memcpy((char*)mapped_buffer + heap_offset + 16 * sizeof(float), &is_alpha_tested, sizeof(int));
 	memcpy((char*)mapped_buffer + heap_offset + 17 * sizeof(float), &alpha_ref, sizeof(float));
+
+	size_t tex_idx = 0;
+	for (u32 i = 0; i < rsx::limits::textures_count; ++i)
+	{
+		if (!textures[i].enabled()) continue;
+		size_t w = textures[i].width(), h = textures[i].height();
+		if (!w || !h) continue;
+
+		int is_unorm = (textures[i].format() & CELL_GCM_TEXTURE_UN);
+		memcpy((char*)mapped_buffer + heap_offset + (18 + tex_idx++) * sizeof(int), &is_unorm, sizeof(int));
+	}
 	m_constants_data.m_heap->Unmap(0, &CD3DX12_RANGE(heap_offset, heap_offset + 256));
 
 	D3D12_CONSTANT_BUFFER_VIEW_DESC constant_buffer_view_desc = {
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12CommonDecompiler.cpp b/rpcs3/Emu/RSX/D3D12/D3D12CommonDecompiler.cpp
index 688470a491..cbf1224c83 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12CommonDecompiler.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12CommonDecompiler.cpp
@@ -42,7 +42,7 @@ std::string getFunctionImp(FUNCTION f)
 	case FUNCTION::FUNCTION_FRACT:
 		return "frac($0)";
 	case FUNCTION::FUNCTION_TEXTURE_SAMPLE:
-		return "$t.Sample($tsampler, $0.xy)";
+		return "$t.Sample($tsampler, $0.xy * $t_scale)";
 	case FUNCTION::FUNCTION_DFDX:
 		return "ddx($0)";
 	case FUNCTION::FUNCTION_DFDY:
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp
index 98eb6c2cc3..776b3aa385 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp
@@ -39,6 +39,22 @@ void D3D12FragmentDecompiler::insertHeader(std::stringstream & OS)
 	OS << "	float4x4 scaleOffsetMat;" << std::endl;
 	OS << "	int isAlphaTested;" << std::endl;
 	OS << "	float alphaRef;" << std::endl;
+	OS << "	int tex0_is_unorm;" << std::endl;
+	OS << "	int tex1_is_unorm;" << std::endl;
+	OS << "	int tex2_is_unorm;" << std::endl;
+	OS << "	int tex3_is_unorm;" << std::endl;
+	OS << "	int tex4_is_unorm;" << std::endl;
+	OS << "	int tex5_is_unorm;" << std::endl;
+	OS << "	int tex6_is_unorm;" << std::endl;
+	OS << "	int tex7_is_unorm;" << std::endl;
+	OS << "	int tex8_is_unorm;" << std::endl;
+	OS << "	int tex9_is_unorm;" << std::endl;
+	OS << "	int tex10_is_unorm;" << std::endl;
+	OS << "	int tex11_is_unorm;" << std::endl;
+	OS << "	int tex12_is_unorm;" << std::endl;
+	OS << "	int tex13_is_unorm;" << std::endl;
+	OS << "	int tex14_is_unorm;" << std::endl;
+	OS << "	int tex15_is_unorm;" << std::endl;
 	OS << "};" << std::endl;
 }
 
@@ -107,7 +123,6 @@ void D3D12FragmentDecompiler::insertConstants(std::stringstream & OS)
 			size_t textureIndex = atoi(PI.name.data() + 3);
 			OS << "Texture2D " << PI.name << " : register(t" << textureIndex << ");" << std::endl;
 			OS << "sampler " << PI.name << "sampler : register(s" << textureIndex << ");" << std::endl;
-			textureIndex++;
 		}
 	}
 }
@@ -129,6 +144,21 @@ void D3D12FragmentDecompiler::insertMainStart(std::stringstream & OS)
 		for (ParamItem PI : PT.items)
 			OS << "	" << PT.type << " " << PI.name << " = float4(0., 0., 0., 0.);" << std::endl;
 	}
+
+	// Declare texture coordinate scaling component (to handle unormalized texture coordinates)
+
+	for (ParamType PT : m_parr.params[PF_PARAM_UNIFORM])
+	{
+		if (PT.type != "sampler2D")
+			continue;
+		for (const ParamItem& PI : PT.items)
+		{
+			size_t textureIndex = atoi(PI.name.data() + 3);
+			OS << "	float2  " << PI.name << "_dim;" << std::endl;
+			OS << "	" << PI.name << ".GetDimensions(" << PI.name << "_dim.x, " << PI.name << "_dim.y);" << std::endl;
+			OS << "	float2  " << PI.name << "_scale = (!!" << PI.name << "_is_unorm) ? float2(1., 1.) / " << PI.name << "_dim : float2(1., 1.);" << std::endl;
+		}
+	}
 }
 
 void D3D12FragmentDecompiler::insertMainEnd(std::stringstream & OS)
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.cpp b/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.cpp
index 3a27b004fd..d603cc9c72 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.cpp
@@ -33,6 +33,22 @@ void D3D12VertexProgramDecompiler::insertHeader(std::stringstream &OS)
 	OS << "	float4x4 scaleOffsetMat;" << std::endl;
 	OS << "	int isAlphaTested;" << std::endl;
 	OS << "	float alphaRef;" << std::endl;
+	OS << "	int tex0_is_unorm;" << std::endl;
+	OS << "	int tex1_is_unorm;" << std::endl;
+	OS << "	int tex2_is_unorm;" << std::endl;
+	OS << "	int tex3_is_unorm;" << std::endl;
+	OS << "	int tex4_is_unorm;" << std::endl;
+	OS << "	int tex5_is_unorm;" << std::endl;
+	OS << "	int tex6_is_unorm;" << std::endl;
+	OS << "	int tex7_is_unorm;" << std::endl;
+	OS << "	int tex8_is_unorm;" << std::endl;
+	OS << "	int tex9_is_unorm;" << std::endl;
+	OS << "	int tex10_is_unorm;" << std::endl;
+	OS << "	int tex11_is_unorm;" << std::endl;
+	OS << "	int tex12_is_unorm;" << std::endl;
+	OS << "	int tex13_is_unorm;" << std::endl;
+	OS << "	int tex14_is_unorm;" << std::endl;
+	OS << "	int tex15_is_unorm;" << std::endl;
 	OS << "};" << std::endl;
 }