zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/coelckers/Raze

Browse source
This commit is contained in:
Christoph Oelckers 2020-01-04 23:23:50 +01:00
commit f6251cdf66
3 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
source/common/rendering/gl/system/gl_framebuffer.cpp
View file

@ -432,20 +432,20 @@ void OpenGLFrameBuffer::PostProcessScene(int fixedcm, const std::function<void()
void videoShowFrame(int32_t w)
{
static GLenum buffers[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2 };
static GLenum buffers[] = { GL_COLOR_ATTACHMENT0, GL_COLOR_ATTACHMENT1, GL_COLOR_ATTACHMENT2 };
if (gl_ssao)
{
glDrawBuffers(1, buffers);
OpenGLRenderer::GLRenderer->AmbientOccludeScene(GLInterface.GetMatrix(Matrix_Projection).get()[5]);
if (gl_ssao)
{
glDrawBuffers(1, buffers);
OpenGLRenderer::GLRenderer->AmbientOccludeScene(GLInterface.GetProjectionM5());
glViewport(screen->mSceneViewport.left, screen->mSceneViewport.top, screen->mSceneViewport.width, screen->mSceneViewport.height);
OpenGLRenderer::GLRenderer->mBuffers->BindSceneFB(true);
glDrawBuffers(3, buffers);
OpenGLRenderer::GLRenderer->mBuffers->BindSceneFB(true);
glDrawBuffers(3, buffers);
// To do: the translucent part of the scene should be drawn here
glDrawBuffers(1, buffers);
}
}
OpenGLRenderer::GLRenderer->mBuffers->BlitSceneToTexture(); // Copy the resulting scene to the current post process texture
screen->PostProcessScene(0, []() {

1
source/glbackend/glbackend.cpp
View file

@ -317,6 +317,7 @@ void GLInstance::UnbindAllTextures()
void GLInstance::SetMatrix(int num, const VSMatrix *mat)
{
if (num == Matrix_Projection) mProjectionM5 = mat->get()[5];
renderState.matrixIndex[num] = matrixArray.Size();
matrixArray.Push(*mat);
}

8
source/glbackend/glbackend.h
View file

@ -199,8 +199,7 @@ class GLInstance
int LastVB_Offset[2] = {};
IIndexBuffer* LastIndexBuffer = nullptr;
VSMatrix matrices[NUMMATRICES];
float mProjectionM5 = 1.0f; // needed by ssao
PolymostRenderState renderState;
FShader* activeShader;
PolymostShader* polymostShader;
@ -260,10 +259,7 @@ public:
LastIndexBuffer = (IIndexBuffer*)~intptr_t(0);
}
const VSMatrix &GetMatrix(int num)
{
return matrices[num];
}
float GetProjectionM5() { return mProjectionM5; }
void SetMatrix(int num, const VSMatrix *mat );
void SetMatrix(int num, const float *mat)
{