enabled GL_ARB_texture_rectangle

diff --git a/docs/VERSIONS b/docs/VERSIONS
index 6c63de9956c4cc421722a8a1a2bdd6556da01a56..f4a5769b333463aa40ddf571537ecceeaaab6b0d 100644 (file)
--- 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 07381f997062970e9b65fe770a63d12a995d74ab..6863eef03d67ec695fdfaeee8a9ddf37434e6bed 100644 (file)
--- 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 d331f9d30a87e07c59a11d2120b9aebbc89c412e..d7c292c9e9aff9598b9619d3ece5e1cc2ebb87e0 100644 (file)
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -3826,6 +3826,8 @@ _mesa_parse_arb_program (GLcontext * ctx, const GLubyte * str, GLsizei len,
           (byte *) "secondary_color", (byte *) "GL_EXT_secondary_color") ||
        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,