rsx/fp: Explicitly insert global functions.

- Functions such as pack/unpack ops must exist before the shared gather functions are declared

rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.cpp

@@ -444,15 +444,17 @@ std::string FragmentProgramDecompiler::BuildCode()
 
 	std::stringstream OS;
 	insertHeader(OS);
-	OS << std::endl;
+	OS << "\n";
 	insertConstants(OS);
-	OS << std::endl;
+	OS << "\n";
 	insertIntputs(OS);
-	OS << std::endl;
+	OS << "\n";
 	insertOutputs(OS);
-	OS << std::endl;
+	OS << "\n";
+
+	//Insert global function definitions
+	insertGlobalFunctions(OS);
 
-	//TODO: Better organization for this
 	std::string float2 = getFloatTypeName(2);
 	std::string float4 = getFloatTypeName(4);
 

rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.h

@@ -207,6 +207,9 @@ protected:
 	/** insert declaration of shader constants.
 	*/
 	virtual void insertConstants(std::stringstream &OS) = 0;
+	/** insert helper functin definitions.
+	*/
+	virtual void insertGlobalFunctions(std::stringstream &OS) = 0;
 	/** insert beginning of main (signature, temporary declaration...)
 	*/
 	virtual void insertMainStart(std::stringstream &OS) = 0;

rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp

@@ -176,10 +176,13 @@ namespace
 	}
 }
 
-void D3D12FragmentDecompiler::insertMainStart(std::stringstream & OS)
+void D3D12FragmentDecompiler::insertGlobalFunctions(std::stringstream &OS)
 {
 	insert_d3d12_legacy_function(OS, true);
+}
 
+void D3D12FragmentDecompiler::insertMainStart(std::stringstream & OS)
+{
 	for (const ParamType &PT : m_parr.params[PF_PARAM_IN])
 	{
 		for (const ParamItem &PI : PT.items)

rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.h

@@ -17,6 +17,7 @@ protected:
 	virtual void insertIntputs(std::stringstream &OS) override;
 	virtual void insertOutputs(std::stringstream &OS) override;
 	virtual void insertConstants(std::stringstream &OS) override;
+	virtual void insertGlobalFunctions(std::stringstream &OS) override;
 	virtual void insertMainStart(std::stringstream &OS) override;
 	virtual void insertMainEnd(std::stringstream &OS) override;
 public:

rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp

@@ -192,10 +192,13 @@ namespace
 	}
 }
 
-void GLFragmentDecompilerThread::insertMainStart(std::stringstream & OS)
+void GLFragmentDecompilerThread::insertGlobalFunctions(std::stringstream &OS)
 {
 	glsl::insert_glsl_legacy_function(OS, glsl::glsl_fragment_program);
+}
 
+void GLFragmentDecompilerThread::insertMainStart(std::stringstream & OS)
+{
 	//TODO: Generate input mask during parse stage to avoid this
 	for (const ParamType& PT : m_parr.params[PF_PARAM_IN])
 	{

rpcs3/Emu/RSX/GL/GLFragmentProgram.h

@@ -28,6 +28,7 @@ protected:
 	virtual void insertIntputs(std::stringstream &OS) override;
 	virtual void insertOutputs(std::stringstream &OS) override;
 	virtual void insertConstants(std::stringstream &OS) override;
+	virtual void insertGlobalFunctions(std::stringstream &OS) override;
 	virtual void insertMainStart(std::stringstream &OS) override;
 	virtual void insertMainEnd(std::stringstream &OS) override;
 };

rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp

@@ -195,10 +195,13 @@ namespace vk
 	}
 }
 
-void VKFragmentDecompilerThread::insertMainStart(std::stringstream & OS)
+void VKFragmentDecompilerThread::insertGlobalFunctions(std::stringstream &OS)
 {
 	glsl::insert_glsl_legacy_function(OS, glsl::glsl_fragment_program);
+}
 
+void VKFragmentDecompilerThread::insertMainStart(std::stringstream & OS)
+{
 	//TODO: Generate input mask during parse stage to avoid this
 	for (const ParamType& PT : m_parr.params[PF_PARAM_IN])
 	{

rpcs3/Emu/RSX/VK/VKFragmentProgram.h

@@ -32,6 +32,7 @@ protected:
 	virtual void insertIntputs(std::stringstream &OS) override;
 	virtual void insertOutputs(std::stringstream &OS) override;
 	virtual void insertConstants(std::stringstream &OS) override;
+	virtual void insertGlobalFunctions(std::stringstream &OS) override;
 	virtual void insertMainStart(std::stringstream &OS) override;
 	virtual void insertMainEnd(std::stringstream &OS) override;
 };