init secondary color to (0,0,0,1). remove some redundant initializations.

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

diff --git a/src/mesa/main/attrib.h b/src/mesa/main/attrib.h
index 0661c2612304412ce073bd90ae71e436c0018cce..09d75196b23b294237e496b0c3aca2c86a0a84a9 100644 (file)
--- a/src/mesa/main/attrib.h
+++ b/src/mesa/main/attrib.h
@@ -1,21 +1,29 @@
-/* $Id: attrib.h,v 1.1 1999/08/19 00:55:41 jtg Exp $ */
+/**
+ * \file attrib.h
+ * Attribute stacks.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
- * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- * 
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -26,22 +34,35 @@
 
 
 
+#ifndef ATTRIB_H
+#define ATTRIB_H
 
 
-#ifndef ATTRIB_H
-#define ATTRIB_h
+#include "mtypes.h"
+
 
+#if _HAVE_FULL_GL
 
-#include "types.h"
+extern void GLAPIENTRY
+_mesa_PushAttrib( GLbitfield mask );
 
+extern void GLAPIENTRY
+_mesa_PopAttrib( void );
 
-extern void gl_PushAttrib( GLcontext* ctx, GLbitfield mask );
+extern void GLAPIENTRY
+_mesa_PushClientAttrib( GLbitfield mask );
 
-extern void gl_PopAttrib( GLcontext* ctx );
+extern void GLAPIENTRY
+_mesa_PopClientAttrib( void );
 
-extern void gl_PushClientAttrib( GLcontext *ctx, GLbitfield mask );
+extern void 
+_mesa_init_attrib( GLcontext *ctx );
 
-extern void gl_PopClientAttrib( GLcontext *ctx );
+#else
 
+/** No-op */
+#define _mesa_init_attrib( c ) ((void)0)
+
+#endif
 
 #endif