Add GLAPIENTRY function decorations for correct operation on Windows.

[mesa.git] / src / mesa / main / context.h

diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index 2687dc596a9993f64c90ed9ff854012349e038c9..e55b383dec6400175ff20ef1e77606275273c9be 100644 (file)
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -133,15 +133,15 @@ _mesa_destroy_framebuffer( GLframebuffer *buffer );
 extern GLcontext *
 _mesa_create_context( const GLvisual *visual,
                       GLcontext *share_list,
-                      void *driver_ctx,
-                      GLboolean direct );
+                      const struct dd_function_table *driverFunctions,
+                      void *driverContext );
 
 extern GLboolean
 _mesa_initialize_context( GLcontext *ctx,
                           const GLvisual *visual,
                           GLcontext *share_list,
-                          void *driver_ctx,
-                          GLboolean direct );
+                          const struct dd_function_table *driverFunctions,
+                          void *driverContext );
 
 extern void
 _mesa_free_context_data( GLcontext *ctx );
@@ -374,7 +374,12 @@ do {                                                                       \
 #define NEED_SECONDARY_COLOR(CTX)                                      \
    (((CTX)->Light.Enabled &&                                           \
      (CTX)->Light.Model.ColorControl == GL_SEPARATE_SPECULAR_COLOR)    \
-    || (CTX)->Fog.ColorSumEnabled)
+    || (CTX)->Fog.ColorSumEnabled                                      \
+    || ((CTX)->VertexProgram.Enabled &&                                        \
+        ((CTX)->VertexProgram.Current->InputsRead & VERT_BIT_COLOR1))  \
+    || ((CTX)->FragmentProgram.Enabled &&                              \
+        ((CTX)->FragmentProgram.Current->InputsRead & FRAG_BIT_COL1))  \
+   )
 
 
 /**