summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephane Marchesin <stephane.marchesin@gmail.com>2010-04-19 23:32:18 -0700
committerStephane Marchesin <stephane.marchesin@gmail.com>2010-04-19 23:32:18 -0700
commit8f66b16a2a064de921bf45a04d02a992b5f85b2a (patch)
treec398d3cdeb95144df808e4eb6f8ae0ef5e2ccc5e
parent6faed5ac6aa38503a7dcf65fd66593f79d61d00c (diff)
GL: yet more GL1.X-ification.
-rw-r--r--render-gl.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/render-gl.c b/render-gl.c
index 7f22f81..6058687 100644
--- a/render-gl.c
+++ b/render-gl.c
@@ -342,6 +342,15 @@ static void init_textures(void)
glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE16, 256, 0,
GL_LUMINANCE, GL_UNSIGNED_SHORT, 0);
+ glGenTextures(1, &render_tex);
+ pglGenFramebuffers(1, &render_fb);
+ pglBindFramebuffer(GL_FRAMEBUFFER_EXT, render_fb);
+ glBindTexture(GL_TEXTURE_RECTANGLE_ARB, render_tex);
+ glTexParameterf(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ glTexParameterf(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGB8, 320, 240, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
+ pglFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_RECTANGLE_ARB, render_tex, 0);
+
error();
}
@@ -585,15 +594,6 @@ void render_init(u32 pixel_size)
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glGenTextures(1,&render_tex);
- pglGenFramebuffers(1, &render_fb);
- pglBindFramebuffer(GL_FRAMEBUFFER_EXT, render_fb);
- glBindTexture(GL_TEXTURE_RECTANGLE_ARB, render_tex);
- glTexParameterf(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexParameterf(GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- glTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGB8, 320, 240, 0, GL_RGB, GL_UNSIGNED_BYTE, NULL);
- pglFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0, GL_TEXTURE_RECTANGLE_ARB, render_tex, 0);
-
error();
init_textures();