diff options
author | marha <marha@users.sourceforge.net> | 2013-09-20 11:47:27 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-09-20 11:47:27 +0200 |
commit | 55c05b8a12944349b00053253d3a49b223a9f4de (patch) | |
tree | ffa9a1d19efffd67daca5f1568fc2394fdbe0534 /mesalib/src/mesa/main/mtypes.h | |
parent | 7f669a708bd35bdf8e842f762ec68f9ad0ec0486 (diff) | |
download | vcxsrv-55c05b8a12944349b00053253d3a49b223a9f4de.tar.gz vcxsrv-55c05b8a12944349b00053253d3a49b223a9f4de.tar.bz2 vcxsrv-55c05b8a12944349b00053253d3a49b223a9f4de.zip |
fontconfig mesa pixman git update 20 Sep 2013
pixman commit aa5c45254eb60ce4c85a25b5343474fb160ffa7c
fontconfig commit 643f8088f0d51107e58d142df47124efec6afab1
mesa commit 1cc3b90d47f92aa0be2d914191fd2f46d2b127d7
Diffstat (limited to 'mesalib/src/mesa/main/mtypes.h')
-rw-r--r-- | mesalib/src/mesa/main/mtypes.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 6d700ece8..c88c1c67b 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -2832,6 +2832,30 @@ struct gl_program_constants GLuint MaxNativeParameters; /* For shaders */ GLuint MaxUniformComponents; /**< Usually == MaxParameters * 4 */ + + /** + * \name Per-stage input / output limits + * + * Previous to OpenGL 3.2, the intrastage data limits were advertised with + * a single value: GL_MAX_VARYING_COMPONENTS (GL_MAX_VARYING_VECTORS in + * ES). This is stored as \c gl_constants::MaxVarying. + * + * Starting with OpenGL 3.2, the limits are advertised with per-stage + * variables. Each stage as a certain number of outputs that it can feed + * to the next stage and a certain number inputs that it can consume from + * the previous stage. + * + * Vertex shader inputs do not participate this in this accounting. + * These are tracked exclusively by \c gl_program_constants::MaxAttribs. + * + * Fragment shader outputs do not participate this in this accounting. + * These are tracked exclusively by \c gl_constants::MaxDrawBuffers. + */ + /*@{*/ + GLuint MaxInputComponents; + GLuint MaxOutputComponents; + /*@}*/ + /* ES 2.0 and GL_ARB_ES2_compatibility */ struct gl_precision LowFloat, MediumFloat, HighFloat; struct gl_precision LowInt, MediumInt, HighInt; @@ -2906,7 +2930,6 @@ struct gl_constants /** Number of varying vectors between any two shader stages. */ GLuint MaxVarying; - GLuint MaxVaryingComponents; /** @{ * GL_ARB_uniform_buffer_object |