Merge branch 'master' into stable

1 files changed, 121 insertions, 0 deletions

diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
new file mode 100644
index 0000000000..c5013b4c1e
--- /dev/null
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
@@ -0,0 +1,121 @@
+// Copyright 2011 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/LinearDiskCache.h"
+#include "Core/ConfigManager.h"
+#include "VideoBackends/OGL/GLUtil.h"
+#include "VideoCommon/GeometryShaderGen.h"
+#include "VideoCommon/PixelShaderGen.h"
+#include "VideoCommon/VertexShaderGen.h"
+
+namespace OGL
+{
+
+class SHADERUID
+{
+public:
+	VertexShaderUid vuid;
+	PixelShaderUid puid;
+	GeometryShaderUid guid;
+
+	SHADERUID() {}
+
+	SHADERUID(const SHADERUID& r) : vuid(r.vuid), puid(r.puid), guid(r.guid) {}
+
+	bool operator <(const SHADERUID& r) const
+	{
+		if (puid < r.puid)
+			return true;
+
+		if (r.puid < puid)
+			return false;
+
+		if (vuid < r.vuid)
+			return true;
+
+		if (r.vuid < vuid)
+			return false;
+
+		if (guid < r.guid)
+			return true;
+
+		return false;
+	}
+
+	bool operator ==(const SHADERUID& r) const
+	{
+		return puid == r.puid && vuid == r.vuid && guid == r.guid;
+	}
+};
+
+
+struct SHADER
+{
+	SHADER() : glprogid(0) { }
+	void Destroy()
+	{
+		glDeleteProgram(glprogid);
+		glprogid = 0;
+	}
+	GLuint glprogid; // OpenGL program id
+
+	std::string strvprog, strpprog, strgprog;
+
+	void SetProgramVariables();
+	void SetProgramBindings();
+	void Bind();
+};
+
+class ProgramShaderCache
+{
+public:
+
+	struct PCacheEntry
+	{
+		SHADER shader;
+		bool in_cache;
+
+		void Destroy()
+		{
+			shader.Destroy();
+		}
+	};
+
+	typedef std::map<SHADERUID, PCacheEntry> PCache;
+
+	static PCacheEntry GetShaderProgram();
+	static GLuint GetCurrentProgram();
+	static SHADER* SetShader(DSTALPHA_MODE dstAlphaMode, u32 components, u32 primitive_type);
+	static void GetShaderId(SHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 components, u32 primitive_type);
+
+	static bool CompileShader(SHADER &shader, const char* vcode, const char* pcode, const char* gcode = nullptr);
+	static GLuint CompileSingleShader(GLuint type, const char *code);
+	static void UploadConstants();
+
+	static void Init();
+	static void Shutdown();
+	static void CreateHeader();
+
+private:
+	class ProgramShaderCacheInserter : public LinearDiskCacheReader<SHADERUID, u8>
+	{
+	public:
+		void Read(const SHADERUID &key, const u8 *value, u32 value_size) override;
+	};
+
+	static PCache pshaders;
+	static PCacheEntry* last_entry;
+	static SHADERUID last_uid;
+
+	static UidChecker<PixelShaderUid,PixelShaderCode> pixel_uid_checker;
+	static UidChecker<VertexShaderUid,VertexShaderCode> vertex_uid_checker;
+	static UidChecker<GeometryShaderUid,ShaderCode> geometry_uid_checker;
+
+	static u32 s_ubo_buffer_size;
+	static s32 s_ubo_align;
+};
+
+}  // namespace OGL