OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- use FShaderProgram through an abstract interface and remove all dependencies on the GL renderer from the shader definition source files.

Browse source
This commit is contained in:
Christoph Oelckers 2018-06-13 22:08:55 +02:00
commit 3401876476
30 changed files with 190 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/gl/shaders/gl_postprocessshader.cpp
View file

@ -111,7 +111,7 @@ bool PostProcessShaderInstance::IsShaderSupported()
void PostProcessShaderInstance::CompileShader()
{
if (mProgram)
if (mProgram.Handle())
return;
// Get the custom shader
@ -164,10 +164,10 @@ void PostProcessShaderInstance::CompileShader()
prolog += uniformTextures;
prolog += pipelineInOut;
mProgram.Compile(FShaderProgram::Vertex, "shaders/glsl/screenquad.vp", "", Desc->ShaderVersion);
mProgram.Compile(FShaderProgram::Fragment, lumpName, code, prolog.GetChars(), Desc->ShaderVersion);
mProgram.Compile(IShaderProgram::Vertex, "shaders/glsl/screenquad.vp", "", Desc->ShaderVersion);
mProgram.Compile(IShaderProgram::Fragment, lumpName, code, prolog.GetChars(), Desc->ShaderVersion);
mProgram.Link(Desc->ShaderLumpName.GetChars());
mInputTexture.Init(mProgram, "InputTexture");
mInputTexture.Init(mProgram.Handle(), "InputTexture");
}
void PostProcessShaderInstance::UpdateUniforms()
@ -176,7 +176,7 @@ void PostProcessShaderInstance::UpdateUniforms()
TMap<FString, PostProcessUniformValue>::Pair *pair;
while (it.NextPair(pair))
{
int location = glGetUniformLocation(mProgram, pair->Key.GetChars());
int location = glGetUniformLocation(mProgram.Handle(), pair->Key.GetChars());
if (location != -1)
{
switch (pair->Value.Type)
@ -207,7 +207,7 @@ void PostProcessShaderInstance::BindTextures()
TMap<FString, FString>::Pair *pair;
while (it.NextPair(pair))
{
int location = glGetUniformLocation(mProgram, pair->Key.GetChars());
int location = glGetUniformLocation(mProgram.Handle(), pair->Key.GetChars());
if (location == -1)
continue;