diff options
| author | WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> | 2020-12-19 17:43:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-19 17:43:53 +0000 |
| commit | df190b04000a8a3c5052de3fd695f6c26892f353 (patch) | |
| tree | 85c53cda9b5e6c73dcfb82f97272e509f023788b /src/GPU_OpenGL.cpp | |
| parent | d6cade25f4ac6b2ebac9d4830ab7b10294bc4c89 (diff) | |
| parent | 659dc58d4d8290d8ef1930d9f21007c0ec4c3739 (diff) | |
Merge branch 'master' into feature/zip-support
Diffstat (limited to 'src/GPU_OpenGL.cpp')
| -rw-r--r-- | src/GPU_OpenGL.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/GPU_OpenGL.cpp b/src/GPU_OpenGL.cpp index 359e9cd..0c6cf00 100644 --- a/src/GPU_OpenGL.cpp +++ b/src/GPU_OpenGL.cpp @@ -36,6 +36,7 @@ int ScreenH, ScreenW; GLuint CompShader[1][3]; GLuint CompScaleLoc[1]; +GLuint Comp3DXPosLoc[1]; GLuint CompVertexBufferID; GLuint CompVertexArrayID; @@ -64,6 +65,7 @@ bool Init() return false; CompScaleLoc[i] = glGetUniformLocation(CompShader[i][2], "u3DScale"); + Comp3DXPosLoc[i] = glGetUniformLocation(CompShader[i][2], "u3DXPos"); glUseProgram(CompShader[i][2]); uni_id = glGetUniformLocation(CompShader[i][2], "ScreenTex"); @@ -180,6 +182,9 @@ void RenderFrame() OpenGL::UseShaderProgram(CompShader[0]); glUniform1ui(CompScaleLoc[0], Scale); + // TODO: support setting this midframe, if ever needed + glUniform1i(Comp3DXPosLoc[0], ((int)GPU3D::RenderXPos << 23) >> 23); + int frontbuf = GPU::FrontBuffer; glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, CompScreenInputTex); |