zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ssao' into qzdoom

This commit is contained in:
Magnus Norddahl 2016-11-28 02:33:41 +01:00
parent dcd389f696 bea113a908
commit ccafe27b22
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/gl/renderer/gl_postprocess.cpp
View File

@ -468,7 +468,10 @@ void FGLRenderer::TonemapScene()
FGLDebug::PushGroup("TonemapScene"); FGLDebug::PushGroup("TonemapScene");
CreateTonemapPalette();
FGLPostProcessState savedState; FGLPostProcessState savedState;
savedState.SaveTextureBindings(2);
mBuffers->BindNextFB(); mBuffers->BindNextFB();
mBuffers->BindCurrentTexture(0); mBuffers->BindCurrentTexture(0);
@ -477,12 +480,18 @@ void FGLRenderer::TonemapScene()
if (mTonemapShader->IsPaletteMode()) if (mTonemapShader->IsPaletteMode())
{ {
glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, mTonemapPalette->GetTextureHandle(0));
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glActiveTexture(GL_TEXTURE0);
mTonemapShader->PaletteLUT.Set(1); mTonemapShader->PaletteLUT.Set(1);
BindTonemapPalette(1);
} }
else else
{ {
savedState.SaveTextureBindings(2);
glActiveTexture(GL_TEXTURE1); glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, mBuffers->ExposureTexture); glBindTexture(GL_TEXTURE_2D, mBuffers->ExposureTexture);
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
@ -496,13 +505,9 @@ void FGLRenderer::TonemapScene()
FGLDebug::PopGroup(); FGLDebug::PopGroup();
} }
void FGLRenderer::BindTonemapPalette(int texunit) void FGLRenderer::CreateTonemapPalette()
{ {
if (mTonemapPalette) if (!mTonemapPalette)
{
mTonemapPalette->Bind(texunit, 0, false);
}
else
{ {
TArray<unsigned char> lut; TArray<unsigned char> lut;
lut.Resize(512 * 512 * 4); lut.Resize(512 * 512 * 4);
@ -523,14 +528,7 @@ void FGLRenderer::BindTonemapPalette(int texunit)
} }
mTonemapPalette = new FHardwareTexture(512, 512, true); mTonemapPalette = new FHardwareTexture(512, 512, true);
mTonemapPalette->CreateTexture(&lut[0], 512, 512, texunit, false, 0, "mTonemapPalette"); mTonemapPalette->CreateTexture(&lut[0], 512, 512, 0, false, 0, "mTonemapPalette");
glActiveTexture(GL_TEXTURE0 + texunit);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glActiveTexture(GL_TEXTURE0);
} }
} }

2
src/gl/renderer/gl_renderer.h
View File

@ -195,7 +195,7 @@ public:
void BloomScene(); void BloomScene();
void TonemapScene(); void TonemapScene();
void ColormapScene(); void ColormapScene();
void BindTonemapPalette(int texunit); void CreateTonemapPalette();
void ClearTonemapPalette(); void ClearTonemapPalette();
void LensDistortScene(); void LensDistortScene();
void ApplyFXAA(); void ApplyFXAA();

5
src/gl/textures/gl_hwtexture.cpp
View File

@ -374,6 +374,11 @@ unsigned int FHardwareTexture::Bind(int texunit, int translation, bool needmipma
return 0; return 0;
} }
unsigned int FHardwareTexture::GetTextureHandle(int translation)
{
TranslatedTexture *pTex = GetTexID(translation);
return pTex->glTexID;
}
void FHardwareTexture::Unbind(int texunit) void FHardwareTexture::Unbind(int texunit)
{ {

1
src/gl/textures/gl_hwtexture.h
View File

@ -83,6 +83,7 @@ public:
unsigned int Bind(int texunit, int translation, bool needmipmap); unsigned int Bind(int texunit, int translation, bool needmipmap);
unsigned int CreateTexture(unsigned char * buffer, int w, int h, int texunit, bool mipmap, int translation, const FString &name); unsigned int CreateTexture(unsigned char * buffer, int w, int h, int texunit, bool mipmap, int translation, const FString &name);
unsigned int GetTextureHandle(int translation);
void Clean(bool all); void Clean(bool all);
void CleanUnused(SpriteHits &usedtranslations); void CleanUnused(SpriteHits &usedtranslations);