From 3e697b363ed411cb8bc104900f76f63e1a594019 Mon Sep 17 00:00:00 2001 From: Ryan Houdek Date: Thu, 25 Jul 2013 18:39:00 +0000 Subject: [PATCH] Fix an issue where TextureConverter.cpp was creating a renderbuffer with the wrong format. Also a few minor shader issues where they were using integers in place of floats. --- Source/Plugins/Plugin_VideoOGL/Src/Render.cpp | 4 ++-- Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp index 74a3033efe..639deecf22 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp @@ -631,8 +631,8 @@ void Renderer::Init() "ATTRIN vec3 color0;\n" "VARYOUT vec4 c;\n" "void main(void) {\n" - " gl_Position = vec4(rawpos,0,1);\n" - " c = vec4(color0, 1.0);\n" + " gl_Position = vec4(rawpos, 0.0f, 1.0f);\n" + " c = vec4(color0, 1.0f);\n" "}\n", "VARYIN vec4 c;\n" "COLOROUT(ocol0)\n" diff --git a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp index d3e73b177b..0ceac2d283 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp @@ -59,7 +59,7 @@ static const char *VProgram = "void main()\n" "{\n" " uv0 = tex0;\n" - " gl_Position = vec4(rawpos,0,1);\n" + " gl_Position = vec4(rawpos, 0.0f, 1.0f);\n" "}\n"; void CreatePrograms() @@ -162,7 +162,7 @@ void Init() glGenRenderbuffers(1, &s_dstRenderBuffer); glBindRenderbuffer(GL_RENDERBUFFER, s_dstRenderBuffer); - glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA, renderBufferWidth, renderBufferHeight); + glRenderbufferStorage(GL_RENDERBUFFER, GLRENDERBUFFERFORMAT, renderBufferWidth, renderBufferHeight); s_srcTextureWidth = 0; s_srcTextureHeight = 0;