diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-21 08:08:22 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-21 08:08:22 +0100 |
| commit | a8a12d4c8be177f63cae7dc96c2b52f09e228a76 (patch) | |
| tree | 72ea4c93cc3337810a32ccc0fb34b3bd96d933e9 /mesalib/src/mesa/main/mtypes.h | |
| parent | e3710c8691dceaccf51bb80e5a1f7d1830758f7e (diff) | |
| parent | 45710577f374972946a8eb37833a9c94e5a299bf (diff) | |
| download | vcxsrv-a8a12d4c8be177f63cae7dc96c2b52f09e228a76.tar.gz vcxsrv-a8a12d4c8be177f63cae7dc96c2b52f09e228a76.tar.bz2 vcxsrv-a8a12d4c8be177f63cae7dc96c2b52f09e228a76.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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 285ec0783..b3427dac1 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -2218,6 +2218,9 @@ struct gl_shader_program /** Post-link transform feedback info. */ struct gl_transform_feedback_info LinkedTransformFeedback; + /** Post-link gl_FragDepth layout for ARB_conservative_depth. */ + enum gl_frag_depth_layout FragDepthLayout; + /** Geometry shader state - copied into gl_geometry_program at link time */ struct { GLint VerticesOut; |