summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Schinagl <oliver@schinagl.nl>2008-01-08 16:05:54 (GMT)
committerOliver Schinagl <oliver@schinagl.nl>2008-01-08 16:05:54 (GMT)
commite12c3cac3be8b7d7936e7c51d325b8e313abfe6c (patch)
tree05fd400dd5add92a025a0bfaf631b5a0f01223a1
parentabff75592f31e40e8cefd67dcc1b29ea26981524 (diff)
download2iv35-e12c3cac3be8b7d7936e7c51d325b8e313abfe6c.zip
2iv35-e12c3cac3be8b7d7936e7c51d325b8e313abfe6c.tar.gz
2iv35-e12c3cac3be8b7d7936e7c51d325b8e313abfe6c.tar.bz2
opengl pre 1.2 compatiblity sorta
-rw-r--r--Smoke/renderer_gl.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/Smoke/renderer_gl.c b/Smoke/renderer_gl.c
index 4864c25..2cdff79 100644
--- a/Smoke/renderer_gl.c
+++ b/Smoke/renderer_gl.c
@@ -9,6 +9,9 @@
#include <GL/gl.h>
#include <GL/glu.h>
+#ifndef GL_VERSION_1_2
+#include <gdk/glext/glext.h>
+#endif
#include <rfftw.h>
@@ -155,6 +158,7 @@ static void render_grid(void)
DIM = fluids_get_dim();
glColor3f(0.0f, 0.0f, 0.5f);
+ glLineWidth(1.0f);
for (i = 0; i < winWidth; i += DIM) {
if (i) {
@@ -337,7 +341,7 @@ GLuint LoadTextures(char *filename)
glGenTextures(1, &texture);
glBindTexture(GL_TEXTURE_2D, texture);
- gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB, width, height, GL_RGB, GL_UNSIGNED_BYTE, imagedata);
+ gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB, width, height, GL_BGR, GL_UNSIGNED_BYTE, imagedata);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
return_value = texture;