fix texgen bug 597589

diff --git a/docs/VERSIONS b/docs/VERSIONS
index 44c72abce3f31772ed19f091aee0282950b07845..5de3d2bdbbcfe3559b5a473b6445f6983baf3ee5 100644 (file)
--- a/docs/VERSIONS
+++ b/docs/VERSIONS
@@ -1174,6 +1174,7 @@ Mesa Version History
        - fixed glTexSubImage3D z-offset bug (Cedric Gautier)
        - fixed RGBA blend enable bug (Ville Syrjala)
        - glAccum is supposed to be a no-op in selection/feedback mode
+       - fixed texgen bug #597589 (John Popplewell)
     Changes:
        - dropped API trace feature (src/Trace/)
        - documentation overhaul.  merged with website content.  more html.

diff --git a/src/mesa/tnl/t_vb_texgen.c b/src/mesa/tnl/t_vb_texgen.c
index a9ae9cc999a2b0d36a9ee1ab9ac8469f849b8255..81c338166532b26669f18ab91f698eee13ed8862 100644 (file)
--- a/src/mesa/tnl/t_vb_texgen.c
+++ b/src/mesa/tnl/t_vb_texgen.c
@@ -550,9 +550,9 @@ static GLboolean run_validate_texgen_stage( GLcontext *ctx,
       if (texUnit->TexGenEnabled) {
         GLuint sz;
 
-        if (texUnit->TexGenEnabled & R_BIT)
+        if (texUnit->TexGenEnabled & Q_BIT)
            sz = 4;
-        else if (texUnit->TexGenEnabled & Q_BIT)
+        else if (texUnit->TexGenEnabled & R_BIT)
            sz = 3;
         else if (texUnit->TexGenEnabled & T_BIT)
            sz = 2;