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

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

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index cb94a29f279b6ee070e1d58e4ec38bac4e8017d1..25ed2ff2755fe60af2dbffebdc71885068c3365e 100644 (file)
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -5,9 +5,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.0
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  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"),
@@ -131,9 +131,9 @@
 /** 
  * Maximum viewport/image width. Must accomodate all texture sizes too. 
  */
-#define MAX_WIDTH 2048
+#define MAX_WIDTH 4096
 /** Maximum viewport/image height */
-#define MAX_HEIGHT 2048
+#define MAX_HEIGHT 4096
 
 /** Maxmimum size for CVA.  May be overridden by the drivers.  */
 #define MAX_ARRAY_LOCK_SIZE 3000
@@ -175,6 +175,7 @@
 
 /* GL_ARB_vertex_program */
 #define MAX_VERTEX_PROGRAM_ADDRESS_REGS 1
+#define MAX_VERTEX_PROGRAM_ATTRIBS     16
 
 /* GL_ARB_fragment_program */
 #define MAX_FRAGMENT_PROGRAM_ADDRESS_REGS 1
@@ -242,32 +243,27 @@
 #define BCOMP 2
 #define ACOMP 3
 
-#ifndef _HAVE_FULL_GL
-#define _HAVE_FULL_GL 1
-#endif
 
 /*
  * Enable/disable features (blocks of code) by setting FEATURE_xyz to 0 or 1.
  */
-#if _HAVE_FULL_GL
-#define FEATURE_NV_vertex_program 1
-#define FEATURE_NV_fragment_program 1
-#define FEATURE_ARB_vertex_buffer_object 1
-#define FEATURE_ARB_vertex_program 1
-#define FEATURE_ARB_fragment_program 1
-#define FEATURE_ARB_occlusion_query 1
-#define FEATURE_NV_fence 1
-#define FEATURE_userclip 1
-#define FEATURE_texgen 1
-#define FEATURE_windowpos 1
-#endif
-
-/*@}*/
-
-
 #ifndef _HAVE_FULL_GL
 #define _HAVE_FULL_GL 1
 #endif
 
+#define FEATURE_ARB_vertex_buffer_object  _HAVE_FULL_GL
+#define FEATURE_ARB_vertex_program  _HAVE_FULL_GL
+#define FEATURE_ARB_fragment_program  _HAVE_FULL_GL
+#define FEATURE_ARB_occlusion_query  _HAVE_FULL_GL
+#define FEATURE_MESA_program_debug  _HAVE_FULL_GL
+#define FEATURE_NV_fence  _HAVE_FULL_GL
+#define FEATURE_NV_fragment_program  _HAVE_FULL_GL
+#define FEATURE_NV_vertex_program  _HAVE_FULL_GL
+#define FEATURE_userclip  _HAVE_FULL_GL
+#define FEATURE_texgen  _HAVE_FULL_GL
+#define FEATURE_windowpos  _HAVE_FULL_GL
+
+/*@}*/
+
 
 #endif /* CONFIG_H */