diff options
author | marha <marha@users.sourceforge.net> | 2012-01-23 08:37:42 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-01-23 08:37:42 +0100 |
commit | 6b7b7d9ce2264b35d19ecec6bf1f28894dbcada7 (patch) | |
tree | e151dcf34c7fa60fcf9bde9963638f3c20a567f6 /mesalib/src/mesa/main/mtypes.h | |
parent | dc56d736fcd8ee767f76674981abbb506a1d69d5 (diff) | |
parent | 45e3694d529b052f4122262c9bdff5476219b2b4 (diff) | |
download | vcxsrv-6b7b7d9ce2264b35d19ecec6bf1f28894dbcada7.tar.gz vcxsrv-6b7b7d9ce2264b35d19ecec6bf1f28894dbcada7.tar.bz2 vcxsrv-6b7b7d9ce2264b35d19ecec6bf1f28894dbcada7.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/mtypes.h')
-rw-r--r-- | mesalib/src/mesa/main/mtypes.h | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index f8ef01d4e..2ff608596 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -1827,6 +1827,22 @@ struct gl_transform_feedback_varying_info { GLint Size; }; +struct gl_transform_feedback_output { + unsigned OutputRegister; + unsigned OutputBuffer; + unsigned NumComponents; + + /** offset (in DWORDs) of this output within the interleaved structure */ + unsigned DstOffset; + + /** + * Offset into the output register of the data to output. For example, + * if NumComponents is 2 and ComponentOffset is 1, then the data to + * offset is in the y and z components of the output register. + */ + unsigned ComponentOffset; +}; + /** Post-link transform feedback info. */ struct gl_transform_feedback_info { unsigned NumOutputs; @@ -1836,21 +1852,7 @@ struct gl_transform_feedback_info { */ unsigned NumBuffers; - struct { - unsigned OutputRegister; - unsigned OutputBuffer; - unsigned NumComponents; - - /** offset (in DWORDs) of this output within the interleaved structure */ - unsigned DstOffset; - - /** - * Offset into the output register of the data to output. For example, - * if NumComponents is 2 and ComponentOffset is 1, then the data to - * offset is in the y and z components of the output register. - */ - unsigned ComponentOffset; - } Outputs[MAX_PROGRAM_OUTPUTS]; + struct gl_transform_feedback_output *Outputs; /** Transform feedback varyings used for the linking of this shader program. * |