Too much changes
This commit is contained in:
@@ -24,7 +24,7 @@ static const char* g_samplersNameTable[SAMPLER_MAX] =
|
||||
"u_lightmapTexture",
|
||||
};
|
||||
|
||||
ShaderSystem* g_shaderSystem = nullptr;
|
||||
ShaderSystem* g_shaderSystem = NULL;
|
||||
|
||||
ShaderSystem::ShaderSystem()
|
||||
{
|
||||
@@ -48,7 +48,7 @@ void ShaderSystem::Shutdown()
|
||||
if (shaderData.shader)
|
||||
{
|
||||
delete shaderData.shader;
|
||||
shaderData.shader = nullptr;
|
||||
shaderData.shader = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -73,7 +73,9 @@ Shader* ShaderSystem::CreateShader(const char* name, const char* vsfilepath, con
|
||||
|
||||
pShader->Create( name, vsfilepath, psfilepath );
|
||||
|
||||
ShaderData shaderData = { name, pShader };
|
||||
ShaderData shaderData;
|
||||
shaderData.name = name;
|
||||
shaderData.shader = pShader;
|
||||
m_shaders.push_back(shaderData);
|
||||
|
||||
return pShader;
|
||||
|
||||
Reference in New Issue
Block a user