From: Michal Krol Date: Thu, 14 Apr 2005 10:21:30 +0000 (+0000) Subject: add FEATURE_ARB_shading_language_100; X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5c968cbc5e1d355a362018defde7ebe926dd1f65;p=mesa.git 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 0ab0e471812..fb975d67293 100644 --- 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 +/*@}*/ + +/** For GL_ARB_fragment_shader */ +/*@{*/ +#define MAX_FRAGMENT_UNIFORM_COMPONENTS 64 +/*@}*/ + +/** For GL_ARB_vertex_shader */ +/*@{*/ +#define MAX_VERTEX_UNIFORM_COMPONENTS 512 +#define MAX_VARYING_FLOATS 32 +#define MAX_VERTEX_TEXTURE_IMAGE_UNITS 0 +#define MAX_COMBINED_TEXTURE_IMAGE_UNITS (MAX_TEXTURE_IMAGE_UNITS + MAX_VERTEX_TEXTURE_IMAGE_UNITS) /*@}*/ @@ -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) +#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 /*@}*/