diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-04 09:28:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-04 09:28:39 +0100 |
| commit | 23e2767dc3e6b8891d4b55b711c70c6bc85a6f85 (patch) | |
| tree | 04c538697c3afbd401afb1bb614460b16be28844 /mesalib/src/mesa/main/APIspec.xml | |
| parent | 125500b44d0253d7fd7a59905ab730151d4f66e2 (diff) | |
| parent | 02f377d5e2dd18537d0807ad63675a0970b5a37d (diff) | |
| download | vcxsrv-23e2767dc3e6b8891d4b55b711c70c6bc85a6f85.tar.gz vcxsrv-23e2767dc3e6b8891d4b55b711c70c6bc85a6f85.tar.bz2 vcxsrv-23e2767dc3e6b8891d4b55b711c70c6bc85a6f85.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/ddraw.h
xorg-server/hw/xwin/winclipboardwndproc.c
xorg-server/hw/xwin/winglobals.c
xorg-server/hw/xwin/winmonitors.c
xorg-server/hw/xwin/winprocarg.c
xorg-server/hw/xwin/winwin32rootlesswndproc.c
xorg-server/include/scrnintstr.h
xorg-server/xkb/ddxList.c
xorg-server/xkb/ddxLoad.c
Diffstat (limited to 'mesalib/src/mesa/main/APIspec.xml')
| -rw-r--r-- | mesalib/src/mesa/main/APIspec.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/APIspec.xml b/mesalib/src/mesa/main/APIspec.xml index a92bb437c..99c726c83 100644 --- a/mesalib/src/mesa/main/APIspec.xml +++ b/mesalib/src/mesa/main/APIspec.xml @@ -288,6 +288,7 @@ <value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/> <value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/> <value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/> + <value name="GL_TEXTURE_EXTERNAL_OES" category="OES_EGL_image_external"/> </desc> <desc name="pname"> @@ -827,6 +828,7 @@ <value name="GL_MATRIX_PALETTE_OES" category="OES_matrix_palette"/> <value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/> <value name="GL_TEXTURE_GEN_STR_OES" category="OES_texture_cube_map"/> + <value name="GL_TEXTURE_EXTERNAL_OES" category="OES_EGL_image_external"/> </desc> <desc name="cap" category="GLES2.0"> @@ -884,6 +886,7 @@ <value name="GL_MATRIX_PALETTE_OES" category="OES_matrix_palette"/> <value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/> <value name="GL_TEXTURE_GEN_STR_OES" category="OES_texture_cube_map"/> + <value name="GL_TEXTURE_EXTERNAL_OES" category="OES_EGL_image_external"/> </desc> <desc name="cap" category="GLES2.0"> @@ -1477,6 +1480,7 @@ <value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/> <value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/> <value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/> + <value name="GL_TEXTURE_EXTERNAL_OES" category="OES_EGL_image_external"/> </desc> <desc name="pname"> @@ -1544,6 +1548,7 @@ <value name="GL_MATRIX_INDEX_ARRAY_OES" category="OES_matrix_palette"/> <value name="GL_WEIGHT_ARRAY_OES" category="OES_matrix_palette"/> <value name="GL_POINT_SIZE_ARRAY_OES" category="OES_point_size_array"/> + <value name="GL_TEXTURE_EXTERNAL_OES" category="OES_EGL_image_external"/> </desc> <desc name="cap" category="GLES2.0"> @@ -2071,6 +2076,7 @@ <value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/> <value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/> <value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/> + <value name="GL_TEXTURE_EXTERNAL_OES" category="OES_EGL_image_external"/> </desc> </template> @@ -3493,6 +3499,7 @@ <desc name="target"> <value name="GL_TEXTURE_2D"/> + <value name="GL_TEXTURE_EXTERNAL_OES" category="OES_EGL_image_external"/> </desc> </template> @@ -3830,6 +3837,7 @@ <category name="EXT_blend_minmax"/> <category name="EXT_multi_draw_arrays"/> <category name="OES_EGL_image"/> + <category name="OES_EGL_image_external"/> <category name="OES_matrix_palette"/> @@ -4118,6 +4126,7 @@ <category name="EXT_blend_minmax"/> <category name="EXT_multi_draw_arrays"/> <category name="OES_EGL_image"/> + <category name="OES_EGL_image_external"/> <category name="NV_draw_buffers"/> <function name="DrawBuffersNV" template="DrawBuffers"/> |