From 93abd51feefd376e1a46808be71f4fbd5469a4f2 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 4 Jun 2013 15:12:14 +0000
Subject: [PATCH] fix compile
---
Fltk/drawContextFltkStringTexture.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Fltk/drawContextFltkStringTexture.cpp b/Fltk/drawContextFltkStringTexture.cpp
index 4b44f6ff19..1e3210f143 100644
--- a/Fltk/drawContextFltkStringTexture.cpp
+++ b/Fltk/drawContextFltkStringTexture.cpp
@@ -15,7 +15,7 @@ class drawContextFltkStringTexture::queueString {
GLfloat r, g, b, alpha;
int fontSize, fontId;
int width;
- int height;
+ int height;
} element;
private:
@@ -75,15 +75,15 @@ class drawContextFltkStringTexture::queueString {
glScalef (2.0f / winw, 2.0f / winh, 1.0f);
glTranslatef (-winw / 2.0f, -winh / 2.0f, 0.0f);
//write the texture on screen
- glEnable (GL_TEXTURE_RECTANGLE);
+ glEnable (GL_TEXTURE_RECTANGLE_ARB);
glPushAttrib(GL_ENABLE_BIT | GL_TEXTURE_BIT | GL_COLOR_BUFFER_BIT);
glDisable(GL_LIGHTING);
glDisable (GL_DEPTH_TEST);
glEnable (GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glGenTextures (1, &textureId);
- glBindTexture (GL_TEXTURE_RECTANGLE, textureId);
- glTexImage2D (GL_TEXTURE_RECTANGLE, 0, GL_ALPHA, w, h, 0,
+ glBindTexture (GL_TEXTURE_RECTANGLE_ARB, textureId);
+ glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_ALPHA, w, h, 0,
GL_ALPHA, GL_UNSIGNED_BYTE, data);
//glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_SRC0_ALPHA);
//printf("error %i %s\n", __LINE__, gluErrorString(glGetError()));
--
GitLab