MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Rewrite post-processor to use OGLRender::copyTexturedRect

Browse Source
This commit is contained in:
Sergey Lipskiy 2017-01-14 14:44:53 +07:00
parent 4b2aef86da
commit efdead07e8
3 changed files with 106 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/OpenGL.cpp
View File

@ -2162,6 +2162,33 @@ void OGLRender::_initStates()
ogl.swapBuffers();
}
#define MAIN_SHADER_VERSION "#version 330 core \n"
const char * strTexrectDrawerVertexShader =
MAIN_SHADER_VERSION
"in highp vec4 aRectPosition; \n"
"in highp vec2 aTexCoord0; \n"
"out mediump vec2 vTexCoord0; \n"
"void main() \n"
"{ \n"
" gl_Position = aRectPosition; \n"
" vTexCoord0 = aTexCoord0; \n"
"} \n"
;
const char* strTextureCopyShader =
MAIN_SHADER_VERSION
"in mediump vec2 vTexCoord0; \n"
"uniform sampler2D uTex0; \n"
"out lowp vec4 fragColor; \n"
" \n"
"void main() \n"
"{ \n"
" fragColor = texture(uTex0, vTexCoord0); \n"
"} \n"
;
void OGLRender::_initData()
{
_initExtensions();
@ -2248,13 +2275,16 @@ void OGLRender::_setSpecialTexrect() const
void OGLRender::copyTexturedRect(GLint _srcX0, GLint _srcY0, GLint _srcX1, GLint _srcY1,
GLuint _srcWidth, GLuint _srcHeight, GLuint _srcTex,
GLint _dstX0, GLint _dstY0, GLint _dstX1, GLint _dstY1,
GLuint _dstWidth, GLuint _dstHeight, GLenum _filter)
GLuint _dstWidth, GLuint _dstHeight, GLenum _filter, GLuint _program)
{
if (_program == 0)
glUseProgram(m_programCopyTex);
else
glUseProgram(_program);
glDisableVertexAttribArray(SC_TEXCOORD1);
glEnableVertexAttribArray(SC_TEXCOORD0);
glVertexAttribPointer(SC_RECT_POSITION, 4, GL_FLOAT, GL_FALSE, sizeof(GLVertex), &m_rect[0].x);
glVertexAttribPointer(SC_TEXCOORD0, 2, GL_FLOAT, GL_FALSE, sizeof(GLVertex), &m_rect[0].s0);
glUseProgram(m_programCopyTex);
const float scaleX = 1.0f / _dstWidth;
const float scaleY = 1.0f / _dstHeight;
@ -2323,7 +2353,7 @@ void OGLRender::copyTexturedRect(GLint _srcX0, GLint _srcY0, GLint _srcX1, GLint
void OGLRender::copyTexturedRect(GLint _srcX0, GLint _srcY0, GLint _srcX1, GLint _srcY1,
GLuint _srcWidth, GLuint _srcHeight, GLuint _srcTex,
GLint _dstX0, GLint _dstY0, GLint _dstX1, GLint _dstY1,
GLuint _dstWidth, GLuint _dstHeight, GLenum _filter)
GLuint _dstWidth, GLuint _dstHeight, GLenum _filter, GLuint _program)
{
glDisable(GL_SCISSOR_TEST);
glBlitFramebuffer(

3
src/OpenGL.h
View File

@ -58,6 +58,7 @@ typedef char GLchar;
#include "common/GLFunctions.h"
#define GL_IMAGE_TEXTURES_SUPPORT
#define GL_MULTISAMPLING_SUPPORT
#define NO_BLIT_BUFFER_COPY
#endif // OS_MAC_OS_X
#endif // GLES2
@ -126,7 +127,7 @@ public:
void copyTexturedRect(GLint _srcX0, GLint _srcY0, GLint _srcX1, GLint _srcY1,
GLuint _srcWidth, GLuint _srcHeight, GLuint _srcTex,
GLint _dstX0, GLint _dstY0, GLint _dstX1, GLint _dstY1,
GLuint _dstWidth, GLuint _dstHeight, GLenum _filter);
GLuint _dstWidth, GLuint _dstHeight, GLenum _filter, GLuint _program = 0);
void drawText(const char *_pText, float x, float y);
void drawOSD();
void clearDepthBuffer(u32 _ulx, u32 _uly, u32 _lrx, u32 _lry);

71
src/PostProcessor.cpp
View File

@ -10,6 +10,9 @@
#include <Graphics/Context.h>
#include <Graphics/Parameters.h>
#define NEW_POST_PROCESSOR
#if defined(GLES3_1)
#define SHADER_VERSION "#version 310 es \n"
#elif defined(GLES3)
@ -39,11 +42,19 @@ SHADER_VERSION
"# define IN attribute \n"
"# define OUT varying \n"
"#endif // __VERSION \n"
#ifndef NEW_POST_PROCESSOR
"IN highp vec2 aRectPosition; \n"
#else
"IN highp vec4 aRectPosition; \n"
#endif
"IN highp vec2 aTexCoord0; \n"
"OUT mediump vec2 vTexCoord; \n"
"void main() { \n"
#ifndef NEW_POST_PROCESSOR
"gl_Position = vec4(aRectPosition.x, aRectPosition.y, 0.0, 1.0);\n"
#else
" gl_Position = aRectPosition; \n"
#endif
"vTexCoord = aTexCoord0; \n"
"} \n"
;
@ -536,7 +547,9 @@ void PostProcessor::_setGLState() {
void PostProcessor::_preDraw(FrameBuffer * _pBuffer)
{
#ifndef NEW_POST_PROCESSOR
_setGLState();
#endif
OGLVideo & ogl = video();
m_pResultBuffer->m_width = _pBuffer->m_width;
@ -559,7 +572,9 @@ void PostProcessor::_preDraw(FrameBuffer * _pBuffer)
void PostProcessor::_postDraw()
{
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
#ifndef NEW_POST_PROCESSOR
video().getRender().dropRenderState();
#endif
glUseProgram(0);
}
@ -573,6 +588,7 @@ FrameBuffer * PostProcessor::doBlur(FrameBuffer * _pBuffer)
_preDraw(_pBuffer);
#ifndef NEW_POST_PROCESSOR
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_FBO_glowMap);
textureCache().activateTexture(0, m_pTextureOriginal);
glUseProgram(m_extractBloomProgram);
@ -596,6 +612,42 @@ FrameBuffer * PostProcessor::doBlur(FrameBuffer * _pBuffer)
textureCache().activateTexture(1, m_pTextureGlowMap);
glUseProgram(m_glowProgram);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
#else
CachedTexture * pDstTex = m_pResultBuffer->m_pTexture;
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_FBO_glowMap);
video().getRender().copyTexturedRect(0, 0, m_pTextureOriginal->realWidth, m_pTextureOriginal->realHeight,
m_pTextureOriginal->realWidth, m_pTextureOriginal->realHeight, m_pTextureOriginal->glName,
0, 0, m_pTextureGlowMap->realWidth, m_pTextureGlowMap->realHeight,
m_pTextureGlowMap->realWidth, m_pTextureGlowMap->realHeight, GL_NEAREST, m_extractBloomProgram);
glUseProgram(m_seperableBlurProgram);
int loc = glGetUniformLocation(m_seperableBlurProgram, "Orientation");
assert(loc >= 0);
glUniform1i(loc, 0);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_FBO_blur);
video().getRender().copyTexturedRect(0, 0, m_pTextureGlowMap->realWidth, m_pTextureGlowMap->realHeight,
m_pTextureGlowMap->realWidth, m_pTextureGlowMap->realHeight, m_pTextureGlowMap->glName,
0, 0, m_pTextureBlur->realWidth, m_pTextureBlur->realHeight,
m_pTextureBlur->realWidth, m_pTextureBlur->realHeight, GL_NEAREST, m_seperableBlurProgram);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_FBO_glowMap);
glUniform1i(loc, 1);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_FBO_blur);
video().getRender().copyTexturedRect(0, 0, m_pTextureBlur->realWidth, m_pTextureBlur->realHeight,
m_pTextureBlur->realWidth, m_pTextureBlur->realHeight, m_pTextureBlur->glName,
0, 0, m_pTextureGlowMap->realWidth, m_pTextureGlowMap->realHeight,
m_pTextureGlowMap->realWidth, m_pTextureGlowMap->realHeight, GL_NEAREST, m_seperableBlurProgram);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_pResultBuffer->m_FBO);
textureCache().activateTexture(1, m_pTextureGlowMap);
video().getRender().copyTexturedRect(0, 0, m_pTextureGlowMap->realWidth, m_pTextureGlowMap->realHeight,
m_pTextureGlowMap->realWidth, m_pTextureGlowMap->realHeight, m_pTextureOriginal->glName,
0, 0, m_pTextureOriginal->realWidth, m_pTextureOriginal->realHeight,
m_pTextureOriginal->realWidth, m_pTextureOriginal->realHeight, GL_NEAREST, m_glowProgram);
#endif
_postDraw();
return m_pResultBuffer;
@ -612,10 +664,20 @@ FrameBuffer * PostProcessor::doGammaCorrection(FrameBuffer * _pBuffer)
_preDraw(_pBuffer);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_pResultBuffer->m_FBO);
#ifndef NEW_POST_PROCESSOR
textureCache().activateTexture(0, m_pTextureOriginal);
glUseProgram(m_gammaCorrectionProgram);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
#else
CachedTexture * pDstTex = m_pResultBuffer->m_pTexture;
video().getRender().copyTexturedRect(0, 0, m_pTextureOriginal->realWidth, m_pTextureOriginal->realHeight,
m_pTextureOriginal->realWidth, m_pTextureOriginal->realHeight, m_pTextureOriginal->glName,
0, 0, pDstTex->realWidth, pDstTex->realHeight,
pDstTex->realWidth, pDstTex->realHeight, GL_NEAREST, m_gammaCorrectionProgram);
#endif
_postDraw();
return m_pResultBuffer;
@ -632,9 +694,18 @@ FrameBuffer * PostProcessor::doOrientationCorrection(FrameBuffer * _pBuffer)
_preDraw(_pBuffer);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_pResultBuffer->m_FBO);
#ifndef NEW_POST_PROCESSOR
textureCache().activateTexture(0, m_pTextureOriginal);
glUseProgram(m_orientationCorrectionProgram);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
#else
CachedTexture * pDstTex = m_pResultBuffer->m_pTexture;
video().getRender().copyTexturedRect(0, 0, m_pTextureOriginal->realWidth, m_pTextureOriginal->realHeight,
m_pTextureOriginal->realWidth, m_pTextureOriginal->realHeight, m_pTextureOriginal->glName,
0, 0, pDstTex->realWidth, pDstTex->realHeight,
pDstTex->realWidth, pDstTex->realHeight, GL_NEAREST, m_orientationCorrectionProgram);
#endif
_postDraw();
return m_pResultBuffer;