diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-13 12:16:00 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-13 12:16:00 +0200 |
| commit | dcf9ae77854778629cabd0d6943dda3678eb91fa (patch) | |
| tree | 087d3bb4beb55bcc0c5857b41d2b5b10edd0e2f3 /mesalib/src/mesa/main/get.c | |
| parent | 2c8d7aa6bda138693fa1827852ba6b75d1721ff8 (diff) | |
| parent | f0a7d1d88be0c31bd471f4428c4493a93f2d9321 (diff) | |
| download | vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.tar.gz vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.tar.bz2 vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/glxext.c
xorg-server/hw/xwin/InitOutput.c
Diffstat (limited to 'mesalib/src/mesa/main/get.c')
| -rw-r--r-- | mesalib/src/mesa/main/get.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c index cff4cf394..15de321e4 100644 --- a/mesalib/src/mesa/main/get.c +++ b/mesalib/src/mesa/main/get.c @@ -328,6 +328,7 @@ EXTRA_EXT(ARB_sync); EXTRA_EXT(ARB_vertex_shader); EXTRA_EXT(EXT_transform_feedback); EXTRA_EXT(ARB_transform_feedback2); +EXTRA_EXT(ARB_transform_feedback3); EXTRA_EXT(EXT_pixel_buffer_object); EXTRA_EXT(ARB_vertex_program); EXTRA_EXT2(NV_point_sprite, ARB_point_sprite); @@ -1247,6 +1248,14 @@ static const struct value_desc values[] = { { GL_TRANSFORM_FEEDBACK_BINDING, LOC_CUSTOM, TYPE_INT, 0, extra_ARB_transform_feedback2 }, + /* GL_ARB_transform_feedback3 */ + { GL_MAX_TRANSFORM_FEEDBACK_BUFFERS, + CONTEXT_INT(Const.MaxTransformFeedbackBuffers), + extra_ARB_transform_feedback3 }, + { GL_MAX_VERTEX_STREAMS, + CONTEXT_INT(Const.MaxVertexStreams), + extra_ARB_transform_feedback3 }, + /* GL_ARB_geometry_shader4 */ { GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB, CONTEXT_INT(Const.MaxGeometryTextureImageUnits), |