AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-21 10:49:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added shader sharing mechanism; added "cook all dirty packages" button; other various tweaks and fixes

Browse Source
This commit is contained in:
Aruki
2017-02-09 10:54:38 -07:00
parent 9b6376af68
commit 6d77604667
19 changed files with 139 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/OpenGL/CShader.cpp
View File

@@ -13,12 +13,14 @@ u64 gFailedCompileCount = 0;
u64 gSuccessfulCompileCount = 0;
CShader* CShader::spCurrentShader = nullptr;
int CShader::smNumShaders = 0;
CShader::CShader()
{
mVertexShaderExists = false;
mPixelShaderExists = false;
mProgramExists = false;
smNumShaders++;
}
CShader::CShader(const char *pkVertexSource, const char *pkPixelSource)
@@ -26,6 +28,7 @@ CShader::CShader(const char *pkVertexSource, const char *pkPixelSource)
mVertexShaderExists = false;
mPixelShaderExists = false;
mProgramExists = false;
smNumShaders++;
CompileVertexSource(pkVertexSource);
CompilePixelSource(pkPixelSource);
@@ -39,6 +42,7 @@ CShader::~CShader()
if (mProgramExists) glDeleteProgram(mProgram);
if (spCurrentShader == this) spCurrentShader = 0;
smNumShaders--;
}
bool CShader::CompileVertexSource(const char* pkSource)

3
src/Core/OpenGL/CShader.h
View File

@@ -23,6 +23,7 @@ class CShader
GLint mTextureUniforms[8];
GLint mNumLightsUniform;
static int smNumShaders;
static CShader* spCurrentShader;
public:
@@ -45,6 +46,8 @@ public:
static CShader* CurrentShader();
static void KillCachedShader();
inline static int NumShaders() { return smNumShaders; }
private:
void CacheCommonUniforms();
void DumpShaderSource(GLuint Shader, const TString& rkOut);