diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-27 10:48:05 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-27 10:48:05 +0100 |
| commit | 9bed5520560f553ac8ad4985ed41b31499d903fc (patch) | |
| tree | e7e6587df3f87e4d5398da78a6b0761171da7d68 /mesalib/src/mapi/glapi | |
| parent | b14c3b05e45201bbbbb3a4beba260c3d6ff31003 (diff) | |
| parent | c74ef795c7282681616decc36a9a81cd1b1b6ec7 (diff) | |
| download | vcxsrv-9bed5520560f553ac8ad4985ed41b31499d903fc.tar.gz vcxsrv-9bed5520560f553ac8ad4985ed41b31499d903fc.tar.bz2 vcxsrv-9bed5520560f553ac8ad4985ed41b31499d903fc.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa pixman xkeyboard-config
Diffstat (limited to 'mesalib/src/mapi/glapi')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/es_EXT.xml | 14 | ||||
| -rwxr-xr-x | mesalib/src/mapi/glapi/gen/glX_proto_send.py | 4 |
2 files changed, 17 insertions, 1 deletions
diff --git a/mesalib/src/mapi/glapi/gen/es_EXT.xml b/mesalib/src/mapi/glapi/gen/es_EXT.xml index 0f6746d2a..ff378acf1 100644 --- a/mesalib/src/mapi/glapi/gen/es_EXT.xml +++ b/mesalib/src/mapi/glapi/gen/es_EXT.xml @@ -663,6 +663,20 @@ <enum name="MAX_TEXTURE_LOD_BIAS_EXT" value="0x84FD"/> </category> +<!-- 64. GL_EXT_discard_framebuffer --> + +<category name="GL_EXT_discard_framebuffer" number="64"> + <function name="DiscardFramebufferEXT" es1="1.0" es2="2.0" + offset="assign" static_dispatch="false" desktop="false"> + <param name="target" type="GLenum"/> + <param name="numAttachments" type="GLsizei"/> + <param name="attachments" type="const GLenum *" count="numAttachments"/> + </function> + <enum name="COLOR_EXT" value="0x1800"/> + <enum name="DEPTH_EXT" value="0x1801"/> + <enum name="STENCIL_EXT" value="0x1802"/> +</category> + <!-- 65. GL_EXT_blend_minmax --> <category name="GL_EXT_read_format_bgra" number="66"> diff --git a/mesalib/src/mapi/glapi/gen/glX_proto_send.py b/mesalib/src/mapi/glapi/gen/glX_proto_send.py index fbc0dd3fa..f4d519f14 100755 --- a/mesalib/src/mapi/glapi/gen/glX_proto_send.py +++ b/mesalib/src/mapi/glapi/gen/glX_proto_send.py @@ -700,7 +700,9 @@ generic_%u_byte( GLint rop, const void * ptr ) if f.reply_always_array: print ' (void)memcpy(%s, %s_data(reply), %s_data_length(reply) * sizeof(%s));' % (output.name, xcb_name, xcb_name, output.get_base_type_string()) else: - print ' if (%s_data_length(reply) == 0)' % (xcb_name) + print ' /* the XXX_data_length() xcb function name is misleading, it returns the number */' + print ' /* of elements, not the length of the data part. A single element is embedded. */' + print ' if (%s_data_length(reply) == 1)' % (xcb_name) print ' (void)memcpy(%s, &reply->datum, sizeof(reply->datum));' % (output.name) print ' else' print ' (void)memcpy(%s, %s_data(reply), %s_data_length(reply) * sizeof(%s));' % (output.name, xcb_name, xcb_name, output.get_base_type_string()) |