i965/vs: Fix NULL pointer dereference in pre-Gen6 push constant loading.

[mesa.git] / src / mesa / drivers / dri / nouveau / nv04_state_raster.c

diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c
index ecfbdfedff6641391bbe94f48fdfbab7ccd94917..78d29fc485b5f78ef0390335dab1e8e4df3c8a3b 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c
@@ -277,7 +277,7 @@ nv04_emit_blend(struct gl_context *ctx, int emit)
                        blend |= NV04_MULTITEX_TRIANGLE_BLEND_SHADE_MODE_FLAT;
 
                /* Secondary color */
-               if (NEED_SECONDARY_COLOR(ctx))
+               if (_mesa_need_secondary_color(ctx))
                        blend |= NV04_MULTITEX_TRIANGLE_BLEND_SPECULAR_ENABLE;
 
                /* Fog. */
@@ -315,7 +315,7 @@ nv04_emit_blend(struct gl_context *ctx, int emit)
                        blend |= get_texenv_mode(GL_MODULATE);
 
                /* Secondary color */
-               if (NEED_SECONDARY_COLOR(ctx))
+               if (_mesa_need_secondary_color(ctx))
                        blend |= NV04_TEXTURED_TRIANGLE_BLEND_SPECULAR_ENABLE;
 
                /* Fog. */