summaryrefslogtreecommitdiffstats
path: root/src/mapi
Commit message (Collapse)AuthorAgeFilesLines
* build/mapi: More killing of TOP in favour of top_srcdirChristopher James Halse Rogers2012-08-132-7/+11
| | | | | Reviewed-by: Eric Anholt <[email protected]> Signed-off-by: Christopher James Halse Rogers <[email protected]>
* build/glapi: fix includes for generated filesChristopher James Halse Rogers2012-08-131-0/+1
| | | | | Reviewed-by: Eric Anholt <[email protected]> Signed-off-by: Christopher James Halse Rogers <[email protected]>
* build: fix out of tree generation of glapi_mapi_tmp.hChristopher James Halse Rogers2012-08-131-1/+1
| | | | | Reviewed-by: Eric Anholt <[email protected]> Signed-off-by: Christopher James Halse Rogers <[email protected]>
* mesa/tests: Fix trivial typos in src/mapi/glapi testsIan Romanick2012-08-081-4/+4
| | | | Signed-off-by: Ian Romanick <[email protected]>
* mesa/tests: Add tests for the generated shared-glapi dispatch tableIan Romanick2012-08-083-0/+490
| | | | | | | | | These are largely based on the src/mapi/glapi/tests. However, shared-glapi provides less external visibility into the dispatch table, so there is less to test. Also, shared-glapi does not implement _glapi_get_proc_name, so that test was removed. Signed-off-by: Ian Romanick <[email protected]>
* glapi: Prevent accidental use of lies w/shared-glapiIan Romanick2012-08-081-0/+6
| | | | Signed-off-by: Ian Romanick <[email protected]>
* glx: Don't use glapitable.h at allIan Romanick2012-08-081-1/+4
| | | | | | | | | | | | When --enable-shared-glapi is used, all non-ABI entries in the table are lies. Avoiding the use of glapitable.h avoids the lies. The only entries used in this code are entries that are ABI. For these, the ABI offset can be used directly. Since this code is in src/glx, it can't use src/mesa/main/dispatch.h to get the pretty names for these offsets. Signed-off-by: Ian Romanick <[email protected]>
* glx: Don't rely on struct _glapi_tableIan Romanick2012-08-081-14/+21
| | | | | | | | | | | | | | | | | | | When --enable-shared-glapi is used, all non-ABI entries in the table are lies. There are two completely separate code generation paths used to assign dispatch offset. Neither has any clue about the other. Unsurprisingly, the can't agree on what offsets to assign. This adds a bunch of overhead to __glXNewIndirectAPI, but this function is called at most once. The test ExtensionNopDispatch was removed. There was just no way to make this test work with the information provided in shared-glapi. Since indirect_glx.c uses _glapi_get_proc_offset now, it was also impossible to make the tests work without shared-glapi. So much pain. This fixes indirect rendering with shared-glapi. Signed-off-by: Ian Romanick <[email protected]>
* mesa/tests: Don't build glapi tests with shared-glapiIan Romanick2012-08-081-0/+2
| | | | | | | This fixes 'make check' on with --enable-shared-glapi. This test cannot work in that environment. Signed-off-by: Ian Romanick <[email protected]>
* shared-glapi: Install libglapi.so.0.0.0 and .0 links in lib/.Kenneth Graunke2012-07-251-1/+3
| | | | | | | | | | | | | | | | | We already provided these files on 'make install', but only created a 'libglapi.so' in the top-level lib/ convenience folder. We used to create all three, but at some point in the build system churn, it broke. Various applications (like the ES2 conformance suite) seem to link against libglapi.so.0, so without these links, setting LD_LIBRARY_PATH and LIBGL_DRIVERS_PATH can lead to using /usr/lib/libglapi.so.0 with /home/whatever/libGL.so, which leads to API calls getting routed incorrectly (i.e. glCompileShader -> _mesa_LinkProgramARB), which leads to rage problems. Preserve developer sanity...install links. Signed-off-by: Kenneth Graunke <[email protected]>
* automake: convert libglapiJon TURNEY2012-07-134-78/+70
| | | | | | | | | | | | | | | | | | | * "configure substitutions are not allowed in _SOURCES variables" in automake, so remove the AC_SUBST'ed GLAPI_ASM_SOURCES and instead use some AM_CONDITIONALS to choose which asm sources are used * Change GLAPI_LIB to point to the .la file in other Makefile.am files, and make a link to the .a file for the convenience of other Makefiles which have not yet been converted to automake v2: - Use AM_CPPFLAGS for cleaner build output - EXTRA_SOURCES is not needed - Remove libglapi.a compatibility link on clean Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Tested-by: Matt Turner <[email protected]>
* Rename X86-64_API -> X86_64_APIJon TURNEY2012-07-131-1/+1
| | | | | | | | automake doesn't allow hyphens in variable names Signed-off-by: Jon TURNEY <[email protected]> Reviewed-by: Eric Anholt <[email protected]> Tested-by: Matt Turner <[email protected]>
* glapi: add ARB_transform_feedback_instancedMarek Olšák2012-07-121-1/+18
| | | | Acked-by: Ian Romanick <[email protected]>
* glapi: add ARB_transform_feedback3Marek Olšák2012-07-121-1/+30
| | | | Acked-by: Ian Romanick <[email protected]>
* mapi: Move GL_NV_draw_buffers extension to es_EXT.xmlKristian Høgsberg2012-07-112-63/+63
| | | | | | | | | | | | 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]>
* glapi: Apply Xorg indent rules to all files generated for the xserverIan Romanick2012-07-111-15/+39
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* glapi: add ARB_timer_queryMarek Olšák2012-07-101-1/+21
| | | | Reviewed-by: Brian Paul <[email protected]>
* mesa: add GL_EXT_texture_rg extension for OpenGL ES 2.x.Gwenole Beauchesne2012-07-041-0/+8
|
* GLES2: upgrade gl2ext.h to version 18099Kristian Høgsberg2012-07-041-10/+0
| | | | | | | | | | | | | | | Redo this commit, and remove the inclusion of gl2ext.h from src/mapi/glapi/glapi_priv.h. The include was added in 8f3be339850ead96f9c6200db4e0db1f74e39d13 to fix a missing prototype for glDrawBuffersNV and others, but it's not possible to include both glext.h and gl2ext.h from the same file. I don't see the missing prototype here (with or without shared glapi) so I'm just removing the offending #include. Also, since we're redoing this, update to the most recent gl2ext.2. Signed-off-by: Kristian Høgsberg <[email protected]>
* Revert "mesa: add GL_EXT_texture_rg extension for OpenGL ES 2.x."Marek Olšák2012-07-041-8/+0
| | | | This reverts commit d1665388ce53d23ee7853e5083ce6f7192061109.
* mesa: add GL_EXT_texture_rg extension for OpenGL ES 2.x.Gwenole Beauchesne2012-07-031-0/+8
|
* glapi/gen: fix out of tree buildDylan Noblesmith2012-07-021-23/+29
| | | | | | | | | | Add "-f $(srcdir)/gl_API.xml" to the arguments of all the scripts that by default look for gl_API.xml in the working directory when run with no arguments, and prepend $(srcdir) to those scripts that are already using an explicit -f argument. Reviewed-by: Kenneth Graunke <[email protected]>
* mesa: more const qualifiers to match the latest glext.hBrian Paul2012-06-275-5/+5
| | | | | | | For some reason regular gcc on Linux didn't catch these but the mingw compiler did (generated errors, not warnings). v2: include the changes in src/mapi/ too
* glapi: add const qualifier to glShaderSourceARB() parameterBrian Paul2012-06-271-1/+1
| | | | | | | | | Fixes the es2 build with gcc. Note: in glext.h the prototypes for glShaderSource() and glShaderSourceARB() disagree: only the former has the extra const qualifier. Reviewed-by: José Fonseca <[email protected]>
* glapi: Add uniform buffer object APIVincent Lejeune2012-06-213-1/+101
| | | | | | | | | v2: Fix a typo spotted by Eric Anholt. v3: Fix missing "GL" on types, fix style, fix Studly_Caps extension name, drop commented code duplicated with GL3x.xml [anholt] Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* automake: Convert src/mapi/glapi/gen to silent build.Eric Anholt2012-06-211-24/+26
|
* automake: Convert src/mapi/glapi/gen/Makefile to automake.Eric Anholt2012-06-212-6/+3
|
* mesa: Add support for GL_ARB_base_instanceFredrik Höglund2012-06-193-1/+43
| | | | Reviewed-by: Brian Paul <[email protected]>
* gles2: Add GL_NV_read_buffer extensionKristian Høgsberg2012-06-182-0/+9
| | | | | | | This lets us select the front buffer for reading under GLES2. Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* glx/tests and mesa/tests: Update .gitignore files.Paul Berry2012-06-141-0/+2
| | | | | | | | | This patch updates .gitignore files to account for the new build artifacts introduced by the following commits: ae376f0 glx/tests: Rename test as glx-test 8fecdcc mesa/tests: Add tests for _mesa_lookup_enum_by_{name,nr} functions a29ad2b mesa/tests: Add tests for the generated dispatch table
* glapi: Remove GL_NV_vertex_array_range from the dispatch tableIan Romanick2012-06-132-5/+6
| | | | | | | | | | | | There is no GLX protocol for these functions. Open-source Linux driver have not supported this extension for many years, and it seems unlikely at this point that this support will return. There's no reason to have slots for these functions in the dispatch table. The unit tests (GetProcAddress::TableDidntShrink and others) are also updated. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Remove GL_NV_fence from the dispatch tableIan Romanick2012-06-132-15/+11
| | | | | | | | | | | | There is no GLX protocol for these functions. No open-source Linux driver has ever supported this extension, and it seems unlikely at this point that one ever will. There's no reason to have slots for these functions in the dispatch table. The unit tests (GetProcAddress::TableDidntShrink and others) are also updated. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Remove GL_NV_register_combiners from the dispatch tableIan Romanick2012-06-132-27/+17
| | | | | | | | | | | | There is no GLX protocol for these functions. No open-source Linux driver has ever supported this extension, and it seems unlikely at this point that one ever will. There's no reason to have slots for these functions in the dispatch table. The unit tests (GetProcAddress::TableDidntShrink and others) are also updated. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Remove GL_APPLE_texture_range from the dispatch tableIan Romanick2012-06-132-5/+6
| | | | | | | | | | | There is no GLX protocol for these functions, and no Linux driver has ever supported this extension. There's no reason to have slots for these functions in the dispatch table. The unit tests (GetProcAddress::TableDidntShrink and others) are also updated. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Remove GL_SGIX_pixel_texture from the dispatch tableIan Romanick2012-06-132-3/+5
| | | | | | | | | | | | There is no GLX protocol for this function. Open-source Linux driver have not supported this extension for many years, and it seems unlikely at this point that this support will return. There's no reason to have slots for this function in the dispatch table. The unit tests (GetProcAddress::TableDidntShrink and others) are also updated. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Remove GL_SGIS_pixel_texture from the dispatch tableIan Romanick2012-06-132-13/+10
| | | | | | | | | | | There is no GLX protocol for these functions, and no Linux driver has ever supported this extension. There's no reason to have slots for these functions in the dispatch table. The unit tests (GetProcAddress::TableDidntShrink and others) are also updated. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* mesa/tests: Add tests for the generated dispatch tableIan Romanick2012-06-132-0/+1691
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Add missing GL_EXT_texture_sRGB_decode enumsIan Romanick2012-06-131-0/+6
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Add missing GL_EXT_framebuffer_sRGB enumsIan Romanick2012-06-131-0/+5
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Add missing GL_EXT_packed_float enumsIan Romanick2012-06-131-0/+6
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Add missing framebuffer sRGB enumIan Romanick2012-06-131-0/+1
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Add uniform buffer object enumsIan Romanick2012-06-131-0/+32
| | | | | | | | These are from OpenGL 3.1 and ARB_uniform_buffer_object. I only added them to 3.1 because that required the least work. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Add missing enums for GL_NV_fragment_programIan Romanick2012-06-131-0/+7
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Add missing enums for GL_ARB_occlusion_query2Ian Romanick2012-06-131-1/+6
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Remove extraneous GL_ from TEXTURE_IMMUTABLE_FORMATIan Romanick2012-06-131-1/+1
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Add missing enums for GL_ATI_fragment_shaderIan Romanick2012-06-131-0/+111
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Add texture swizzle enumsIan Romanick2012-06-131-0/+5
| | | | | | | | | These are from OpenGL 3.3, ARB_texture_swizzle, and EXT_texture_swizzle (with different names). I only added them to 3.3 because that required the least work. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Add a couple missing 3.0 enumsIan Romanick2012-06-131-0/+2
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Add missing _NV extension on COMBINE4Ian Romanick2012-06-131-1/+1
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Add missing enums for GL_EXT_vertex_arrayIan Romanick2012-06-131-0/+9
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>