Mesa (master): mesa: fix shininess check for ffvertex_prog v2

Ilia Mirkin imirkin at kemper.freedesktop.org
Tue May 5 20:24:25 UTC 2015


Module: Mesa
Branch: master
Commit: ce01c0af70f2475fbbb1c3ab90d43a19047abc5c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ce01c0af70f2475fbbb1c3ab90d43a19047abc5c

Author: Tim Rowley <timothy.o.rowley at intel.com>
Date:   Mon May  4 16:54:27 2015 -0500

mesa: fix shininess check for ffvertex_prog v2

Switch to using VERT_BIT_GENERIC macro, as varying_vp_inputs is a
bitmask.

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: mesa-stable at lists.freedesktop.org

---

 src/mesa/main/ffvertex_prog.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 7fdd9ba..70adaf8 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -135,7 +135,7 @@ static GLboolean check_active_shininess( struct gl_context *ctx,
        (key->light_color_material_mask & (1 << attr)))
       return GL_TRUE;
 
-   if (key->varying_vp_inputs & VERT_ATTRIB_GENERIC(attr))
+   if (key->varying_vp_inputs & VERT_BIT_GENERIC(attr))
       return GL_TRUE;
 
    if (ctx->Light.Material.Attrib[attr][0] != 0.0F)




More information about the mesa-commit mailing list