Fix an issue where TextureConverter.cpp was creating a renderbuffer w…

…ith the wrong format. Also a few minor shader issues where they were using integers in place of floats.
dolphin-emu · Jul 25, 2013 · 3e697b3 · 3e697b3
1 parent e0a5f78
commit 3e697b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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;