add FEATURE_ARB_shading_language_100;

remove FEATURE_shading_language;
add ARB_fragment/vertex_shader max values

diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index 0ab0e471812edd29e11ccfc9d088860dc66857fd..fb975d672933f404f2a40549c5ad125de1626a6a 100644 (file)
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -199,6 +199,19 @@
 #define MAX_PROGRAM_LOCAL_PARAMS 96
 #define MAX_PROGRAM_MATRICES 8
 #define MAX_PROGRAM_MATRIX_STACK_DEPTH 4
+/*@}*/\r
+\r
+/** For GL_ARB_fragment_shader */\r
+/*@{*/\r
+#define MAX_FRAGMENT_UNIFORM_COMPONENTS 64\r
+/*@}*/\r
+\r
+/** For GL_ARB_vertex_shader */\r
+/*@{*/\r
+#define MAX_VERTEX_UNIFORM_COMPONENTS 512\r
+#define MAX_VARYING_FLOATS 32\r
+#define MAX_VERTEX_TEXTURE_IMAGE_UNITS 0\r
+#define MAX_COMBINED_TEXTURE_IMAGE_UNITS (MAX_TEXTURE_IMAGE_UNITS + MAX_VERTEX_TEXTURE_IMAGE_UNITS)\r
 /*@}*/
 
 
@@ -294,13 +307,10 @@
 #define FEATURE_windowpos  _HAVE_FULL_GL
 #define FEATURE_ARB_vertex_shader _HAVE_FULL_GL
 #define FEATURE_ARB_fragment_shader _HAVE_FULL_GL
-#define FEATURE_ARB_shader_objects (FEATURE_ARB_vertex_shader || FEATURE_ARB_fragment_shader)
+#define FEATURE_ARB_shader_objects (FEATURE_ARB_vertex_shader || FEATURE_ARB_fragment_shader)\r
+#define FEATURE_ARB_shading_language_100 FEATURE_ARB_shader_objects
 #define FEATURE_ATI_fragment_shader _HAVE_FULL_GL
 #define FEATURE_EXT_framebuffer_object _HAVE_FULL_GL
-
-#ifndef FEATURE_shading_language
-#define FEATURE_shading_language 0
-#endif
 /*@}*/