diff options
| author | Kristian Høgsberg <[email protected]> | 2012-07-10 23:15:28 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2012-07-11 15:28:36 -0400 |
| commit | 2adfce4a18c8f97b9f3fc4568c5a4e10ce18a8f8 (patch) | |
| tree | 2d770dcd6cc5d018eb070962411d7af3d5ebbefa | |
| parent | e6a33570b73aa56c87818d7f67a122d4427b7841 (diff) | |
mapi: Move GL_NV_draw_buffers extension to es_EXT.xml
We don't generate public entrypoints for GLES extensions, so move the
GL_NV_draw_buffers definition from ARB_draw_buffers.xml to es_EXT.xml.
When the extension is defined in ARB_draw_buffers.xml, we end up with a
public entry point for it, but no prototype, which gives an error when
compiled with --disable-asm and --disable-shared-glapi.
Instead, just move the GLES extension to es_EXT.xml so this doesn't happen.
Signed-off-by: Kristian Høgsberg <[email protected]>
| -rw-r--r-- | src/mapi/glapi/gen/ARB_draw_buffers.xml | 63 | ||||
| -rw-r--r-- | src/mapi/glapi/gen/es_EXT.xml | 63 |
2 files changed, 63 insertions, 63 deletions
diff --git a/src/mapi/glapi/gen/ARB_draw_buffers.xml b/src/mapi/glapi/gen/ARB_draw_buffers.xml index f8ecc11eef7..3d47172673a 100644 --- a/src/mapi/glapi/gen/ARB_draw_buffers.xml +++ b/src/mapi/glapi/gen/ARB_draw_buffers.xml @@ -121,67 +121,4 @@ </function> </category> -<!-- - This extension serves a similar purpose to ARB_draw_buffers except - that this is for OpenGL ES 2.0. ---> -<category name="GL_NV_draw_buffers" number="91"> - <enum name="MAX_DRAW_BUFFERS_NV" count="1" value="0x8824"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER0_NV" count="1" value="0x8825"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER1_NV" count="1" value="0x8826"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER2_NV" count="1" value="0x8827"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER3_NV" count="1" value="0x8828"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER4_NV" count="1" value="0x8829"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER5_NV" count="1" value="0x882A"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER6_NV" count="1" value="0x882B"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER7_NV" count="1" value="0x882C"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER8_NV" count="1" value="0x882D"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER9_NV" count="1" value="0x882E"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER10_NV" count="1" value="0x882F"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER11_NV" count="1" value="0x8830"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER12_NV" count="1" value="0x8831"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER13_NV" count="1" value="0x8832"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER14_NV" count="1" value="0x8833"> - <size name="Get" mode="get"/> - </enum> - <enum name="DRAW_BUFFER15_NV" count="1" value="0x8834"> - <size name="Get" mode="get"/> - </enum> - - <function name="DrawBuffersNV" alias="DrawBuffersARB"> - <param name="n" type="GLsizei" counter="true"/> - <param name="bufs" type="const GLenum *" count="n"/> - </function> -</category> - </OpenGLAPI> diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml index ad83d9142d1..d012ccd5bf3 100644 --- a/src/mapi/glapi/gen/es_EXT.xml +++ b/src/mapi/glapi/gen/es_EXT.xml @@ -627,6 +627,69 @@ <enum name="REQUIRED_TEXTURE_IMAGE_UNITS_OES" value="0x8D68"/> </category> +<!-- + This extension serves a similar purpose to ARB_draw_buffers except + that this is for OpenGL ES 2.0. +--> +<category name="GL_NV_draw_buffers" number="91"> + <enum name="MAX_DRAW_BUFFERS_NV" count="1" value="0x8824"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER0_NV" count="1" value="0x8825"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER1_NV" count="1" value="0x8826"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER2_NV" count="1" value="0x8827"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER3_NV" count="1" value="0x8828"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER4_NV" count="1" value="0x8829"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER5_NV" count="1" value="0x882A"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER6_NV" count="1" value="0x882B"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER7_NV" count="1" value="0x882C"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER8_NV" count="1" value="0x882D"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER9_NV" count="1" value="0x882E"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER10_NV" count="1" value="0x882F"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER11_NV" count="1" value="0x8830"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER12_NV" count="1" value="0x8831"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER13_NV" count="1" value="0x8832"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER14_NV" count="1" value="0x8833"> + <size name="Get" mode="get"/> + </enum> + <enum name="DRAW_BUFFER15_NV" count="1" value="0x8834"> + <size name="Get" mode="get"/> + </enum> + + <function name="DrawBuffersNV" alias="DrawBuffersARB"> + <param name="n" type="GLsizei" counter="true"/> + <param name="bufs" type="const GLenum *" count="n"/> + </function> +</category> + <!-- 93. GL_NV_read_buffer --> <category name="NV_read_buffer"> <function name="ReadBufferNV" offset="assign"> |