OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- added a RenderQueue parameter to all Bind functions of the postprocessing shaders. This is unused for now. All places calling these pass a dummy NOQUEUE value which is just a nullptr.

Browse source 
This is for Vulkan preparation where all of this needs to run in a user-specified context so that this code can be moved out of the GL folder without depending on OpenGL's global state model.
This commit is contained in:
Christoph Oelckers 2018-06-13 20:30:51 +02:00
commit 8bf009bd89
28 changed files with 91 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -55,7 +55,7 @@ void FCustomPostProcessShaders::Run(FString target)
{
if (shader->Desc->Target == target)
{
shader->Run();
shader->Run(NOQUEUE);
}
}
}
@ -68,7 +68,7 @@ PostProcessShaderInstance::~PostProcessShaderInstance()
glDeleteTextures(1, (GLuint*)&it.second);
}
void PostProcessShaderInstance::Run()
void PostProcessShaderInstance::Run(IRenderQueue *q)
{
if (!IsShaderSupported())
return;
@ -88,7 +88,7 @@ void PostProcessShaderInstance::Run()
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
mProgram.Bind();
mProgram.Bind(q);
UpdateUniforms();
BindTextures();