summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2004-08-20 14:21:20 +0000
committerBrian Paul <[email protected]>2004-08-20 14:21:20 +0000
commitedfe0fe78b299cd3ddc5b447459cbcf9e94f534f (patch)
tree4c719424eee19fcd33b5d8b0e10bc27fcf2c3716
parentd4edb532012bffbeac7b3aa038aba11977cdf572 (diff)
enabled GL_ARB_texture_rectangle
-rw-r--r--docs/VERSIONS1
-rw-r--r--src/mesa/main/extensions.c1
-rw-r--r--src/mesa/shader/arbprogparse.c2
3 files changed, 4 insertions, 0 deletions
diff --git a/docs/VERSIONS b/docs/VERSIONS
index 6c63de9956c..f4a5769b333 100644
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -1278,6 +1278,7 @@ Mesa Version History
6.2 Month, day, 2004
New:
+ - enabled GL_ARB_texture_rectangle (same as GL_NV_texture_rectangle)
Changes:
Bug fixes:
- OpenGL version 1.5 doesn't need GL_ARB_texture_non_power_of_two
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 07381f99706..6863eef03d6 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -65,6 +65,7 @@ static const struct {
{ OFF, "GL_MESAX_texture_float", F(ARB_texture_float) },
{ OFF, "GL_ARB_texture_mirrored_repeat", F(ARB_texture_mirrored_repeat)},
{ OFF, "GL_ARB_texture_non_power_of_two", F(ARB_texture_non_power_of_two)},
+ { OFF, "GL_ARB_texture_rectangle", F(NV_texture_rectangle) },
{ ON, "GL_ARB_transpose_matrix", F(ARB_transpose_matrix) },
{ OFF, "GL_ARB_vertex_buffer_object", F(ARB_vertex_buffer_object) },
{ OFF, "GL_ARB_vertex_program", F(ARB_vertex_program) },
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index d331f9d30a8..d7c292c9e9a 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -3827,6 +3827,8 @@ _mesa_parse_arb_program (GLcontext * ctx, const GLubyte * str, GLsizei len,
enable_ext (ctx, arbprogram_syn_id,
(byte *) "fog_coord", (byte *) "GL_EXT_fog_coord") ||
enable_ext (ctx, arbprogram_syn_id,
+ (byte *) "texture_rectangle", (byte *) "GL_ARB_texture_rectangle") ||
+ enable_ext (ctx, arbprogram_syn_id,
(byte *) "texture_rectangle", (byte *) "GL_EXT_texture_rectangle") ||
enable_ext (ctx, arbprogram_syn_id,
(byte *) "texture_rectangle", (byte *) "GL_NV_texture_rectangle") ||