summaryrefslogtreecommitdiffstats
path: root/src/mapi
Commit message (Collapse)AuthorAgeFilesLines
* Always build shared glapiMatt Turner2012-01-202-19/+0
| | | | | | | | libglapi.so, libGL.so, libGLESv2.so, libGLESv1_CM.so must all come from the same version of Mesa or bad things may happen. Acked-by: Kenneth Graunke <[email protected]> Signed-off-by: Matt Turner <[email protected]>
* Regenerate files from previous commitsIan Romanick2011-12-131-4/+32
| | | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Adam Jackson <[email protected]>
* glapi/glx: For GLX code, use the existing _X_HIDDEN and _X_INTERNAL definesIan Romanick2011-12-133-25/+25
| | | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Adam Jackson <[email protected]>
* glapi/glx: Generate glapi_gentable.c so that the xserver can use itIan Romanick2011-12-131-5/+33
| | | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Adam Jackson <[email protected]>
* glapi/glx: Generate dispatch.h so that the xserver can use itIan Romanick2011-12-131-0/+4
| | | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Adam Jackson <[email protected]>
* glapi/glx: Xserver wants dispatch.h, not glapidispatch.hIan Romanick2011-12-132-3/+5
| | | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Adam Jackson <[email protected]>
* glapi/glx: Don't send GL API files to the xserverIan Romanick2011-12-131-7/+0
| | | | | | | | | The versions in the xserver and in libGL have diverged enough that the xserver doesn't want these. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Adam Jackson <[email protected]>
* glapi: Remove mention of nonexistent enumsIan Romanick2011-12-131-2/+7
| | | | | | | | | | | glext.h doesn't have GL_MIN_PROGRAM_TEXEL_OFFSET_EXT or GL_MAX_PROGRAM_TEXEL_OFFSET_EXT. Using them in the XML causes code to be generated for the xserver that won't compile. Use the names that exist instead. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Adam Jackson <[email protected]>
* glapi/glx: Remove g_disptab.h from xserver generated filesIan Romanick2011-12-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | That file was removed from the xserver with commit: commit a80780a7638f847c3be20e5e0c7fe85e83d9bdd1 Author: Adam Jackson <[email protected]> Date: Wed Nov 17 09:03:06 2010 -0500 glx: Remove swap barrier and hyperpipe support Never implemented in any open source driver. The implementation assumed explicit DDX driver knowledge of how the client-side driver worked, since at the time the server's GL renderer was not a DRI driver. But now, it is, so any implementation of these should be done with additional DRI driver API, like the swap control extension. Reviewed-by: Julien Cristau <[email protected]> Signed-off-by: Kristian Høgsberg <[email protected]> Signed-off-by: Adam Jackson <[email protected]> Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Adam Jackson <[email protected]>
* glapi: add GL_OES_compressed_ETC1_RGB8_texture for GLESChia-I Wu2011-12-021-0/+4
| | | | Reviewed-by: Brian Paul <[email protected]>
* glapi: s/INLINE/inline/ for dispatch.h fileBrian Paul2011-11-301-2/+2
|
* Remove windows kernel support code.José Fonseca2011-11-293-179/+174
| | | | | | Not actively used. Reviewed-by: Brian Paul <[email protected]>
* glapi: add ARB_texture_rgb10_a2ui support.Dave Airlie2011-11-272-0/+14
| | | | | | | | This just adds one enum. regenerate enums.c. Signed-off-by: Dave Airlie <[email protected]>
* android: clean up libglapi bulid rules a bitChia-I Wu2011-11-261-12/+27
| | | | | Make the output prettier. Make the rules reusable if we ever want to add other modules, such as libGLESv2_mesa.
* mesa,glsl,mapi: Put extern "C" { ... } where appropriate.José Fonseca2011-11-093-5/+32
| | | | | Probably a several places missing, but enough to cover all headers (in)directly included by uniform_query.cpp, and fix the MSVC build.
* glapi: add entry points for OES_EGL_image_externalChia-I Wu2011-11-031-0/+8
| | | | | | | Only enums actually. Reviewed-by: Brian Paul <[email protected]> Acked-by: Jakob Bornecrantz <[email protected]>
* glapi: regenerated API files for GL_ARB_texture_storageBrian Paul2011-10-318-3911/+4385
|
* glapi: new API specs for GL_ARB_texture_storageBrian Paul2011-10-313-0/+70
|
* glapi: Enclose glapi.h in an extern "C" block when included by C++.Kenneth Graunke2011-10-041-0/+6
| | | | | | | | Fixes a build failure introduced in commit b7fa0d0727a3a9e1f64d3cfc7a0f157b35dec09e. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-and-tested-by: Paul Berry <[email protected]>
* glapi: regen API files for new extensionIan Romanick2011-10-047-161/+191
| | | | Signed-off-by: Ian Romanick <[email protected]>
* glapi: Add entry point for NV_draw_buffersIan Romanick2011-10-042-0/+65
| | | | | Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Move ARB_draw_buffers extension to a separate fileIan Romanick2011-10-042-118/+125
| | | | | | | | This also moves ATI_draw_buffers. This is to facilitate enabling NV_draw_buffers in OpenGL ES 2.0. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Brian Paul <[email protected]>
* glapi: Don't emit remap data for individual extensionsIan Romanick2011-09-191-38/+5
| | | | | | | | | | | | | | | All of the extensions actually supported by Mesa have been remapped by remap.c for a long time. Emitting all of these data structures is just clutter. Drivers that need additional functions remapped, should add 'offset="assign"' to the function definition in the .xml file. The changes to remap_helper.h are in a follow-on ~8700 line patch that would surely be rejected by the mailing list. Signed-off-by: Ian Romanick <[email protected]> Reviewed-by: Chia-I Wu <[email protected]>
* Define INLINE macro in terms of inline.José Fonseca2011-09-081-11/+14
|
* glapi: regen API files for new extensionDave Airlie2011-09-068-4253/+6863
| | | | Signed-off-by: Dave Airlie <[email protected]>
* glapi: add ARB_vertex_type_2_10_10_10_rev entrypoints. (v2)Dave Airlie2011-09-063-0/+229
| | | | | | | | | | These are the new API entrypoints for ARB_vertex_type_2_10_10_10_rev extension, along with the new INT_2_10_10_10_REV enum. v2: fixup crazy whitespace cut-n-paste mess Signed-off-by: Dave Airlie <[email protected]> Reviewed-by: Eric Anholt <[email protected]>
* mapi: Commit generated files modified by previous commitIan Romanick2011-08-267-19/+1309
| | | | | Some of the changes are spurious because somebody forgot to do this when adding glFramebufferTextureLayerARB.
* mapi: Silence many "warning: unused parameter"Ian Romanick2011-08-262-1/+17
| | | | | | | | When generating dispatch templates, emit the '(void) blah;' magic to make GCC happy. This reduces a lot of warning spam if you build with -Wunused-parameter or -Wextra. Reviewed-by: Chia-I Wu <[email protected]>
* mesa: Remove support for BeOSIan Romanick2011-08-266-100/+5
| | | | | | | | | | Acked-by: Kristian Høgsberg <[email protected]> Acked-by: Marek Olšák <[email protected]> Acked-by: Alan Coopersmith <[email protected]> Acked-by: Jakob Bornecrantz <[email protected]> Acked-by: Dave Airlie <[email protected]> Build-Tested-by: Jakob Bornecrantz <[email protected]> Tested-by: Eugeni Dodonov <[email protected]>
* scons: don't compile some files with -gstabs if using mingw32Brian Paul2011-08-261-0/+5
| | | | | | Compiling some (large) files with i686-pc-mingw32-gcc 4.2.2 (at least) and the -gstabs option triggers a compiler error. Use this work-around to simply compile the effected files without -gstabs.
* android: build shared glapiChia-I Wu2011-08-211-0/+60
| | | | | | This builds the shared library libglapi from shared glapi. Reviewed-by: Chad Versace <[email protected]>
* glapi: update .gitignore for generated ES dispatch headersPaul Berry2011-08-181-3/+0
| | | | | | | | | | | Commit 6eff33dc (glapi: generate ES dispatch headers from core mesa) replaced the autogenerated files src/mapi/es1api/main/{dispatch,remap_helper}.h with new autogenerated files src/mesa/main/api_exec_es{1,2}_{dispatch,remap_helper}.h. This patch updates the .gitignore files to properly ignore the new autogenerated files, and stop ignoring the old autogenerated files. Reviewed-by: Chia-I Wu <[email protected]>
* glapi: remove gen-esChia-I Wu2011-08-1313-7703/+0
| | | | Not used anymore.
* glapi: generate ES dispatch headers from core mesaChia-I Wu2011-08-131-8/+1
| | | | | | | | | | GLESv1 and GLESv2 have their own dispatch.h and remap_helper.h. These headers are only used by api_exec_es1.c and api_exec_es2.c in core mesa. Move the rules to generate them from glapi to core mesa. Reviewed-by: Brian Paul <[email protected]> [olv: updated after reviewing to fix SCons build]
* glapi: add glapi_gen.mk to help header generationChia-I Wu2011-08-133-17/+61
| | | | | | | | | | | glapi_gen.mk is supposed to be included by glapi users to simplify header generation. This commit also makes es1api, es2api, and shared-glapi use it. Reviewed-by: Brian Paul <[email protected]> [olv: updated after reviewing to prefix all variables in glapi_gen.mk by glapi_gen]
* glapi: use gl_and_es_API.xml to generate GLES headersChia-I Wu2011-08-134-15/+39
| | | | | | | | | | | | glapi/gen-es/ defines two sets of GLAPI XMLs for OpenGL ES 1.1 (es1_API.xml) and 2.0 (es2_API.xml) respectively. They are used to generate dispatch.h and remap_helper.h for GLES. Together with gl_and_es_API.xml, we have to maintain three sets of GLAPI XMLs. This commit makes dispatch.h and remap_helper.h for GLES be generated from gl_and_es_API.xml. Reviewed-by: Brian Paul <[email protected]>
* glapi: add methods to filter functionsChia-I Wu2011-08-131-7/+39
| | | | | | | add gl_api::filter_functions and gl_function::filter_entry_points to filter out unwanted functions and entry points. Reviewed-by: Brian Paul <[email protected]>
* glapi: add gles_api.pyChia-I Wu2011-08-133-417/+464
| | | | | | | | | | | | Move the list of entry points belong to GLES from mapi_abi.py to a new file. Until we figure out how to describe the APIs an entry point belongs to in the XML file, and how to handle the case where an entry point others alias is missing in some APIs, this is an easier solution than maintaining another two sets of XMLs in glapi/gen-es/. Reviewed-by: Brian Paul <[email protected]>
* glapi: Update specs to correctly list FramebufferTextureLayerARB as an alias ↵Jeremy Huddleston2011-06-201-1/+1
| | | | | | | | | | of FramebufferTextureLayerEXT FramebufferTextureLayer is an alias of FramebufferTextureLayerEXT, so FramebufferTextureLayerARB needs to be listed as an alias of FramebufferTextureLayerEXT rather than FramebufferTextureLayer. Signed-off-by: Jeremy Huddleston <[email protected]>
* scons: Correct glapi USE_xxx_ASM flags.José Fonseca2011-06-171-11/+4
|
* glapi: _glapi_create_table_from_handle: Set missing pointers to NoOp rather ↵Jeremy Huddleston2011-06-142-2586/+2666
| | | | | | | | | | | | | | than NULL This change to _glapi_create_table_from_handle causes it to fill the dispatch table with NoOps for unimplemented functionality. This matches what is done in indirect_init.c and also allows us to enable logging (when built with -DDEBUG and the MESA_DEBUG or LIBGL_DEBUG environment variables are set) to catch cases where clients are trying to use these unimplemented extentions. Additionally, this fixes some gcc -pedantic warnings. Signed-off-by: Jeremy Huddleston <[email protected]>
* glapi: Add check for NULL symbol_prefix in gentable and fix warningsJeremy Huddleston2011-06-132-2594/+3891
| | | | Signed-off-by: Jeremy Huddleston <[email protected]>
* mapi: declare x86_entry_start/end staticChia-I Wu2011-06-132-5/+6
| | | | | x86_entry_start and x86_entry_end are defined by the inline assembly. Declaring them static saves one instruction in entry_get_public.
* mapi: Fix tls with shared/es-glapi on x86-64Benjamin Franzke2011-06-131-1/+3
| | | | | | | | | | | x86_64_entry_start needs to be declared static in the C code, in order to have the correct address in entry_get_public (seems not to be needed on x86). The compiler needs to lookup a local not a global object. Otherwise addresses needed for _glapi_proc_address will be computed from some random offset (0x6400229a61058b48 in my case).
* glapi: Add API that can create a _glapi_table from a dlfcn handleJeremy Huddleston2011-06-115-2/+7947
| | | | | | | | | Example usage: void *handle = dlopen(opengl_library_path, RTLD_LOCAL); struct _glapi_table *disp = _glapi_create_table_from_handle(handle, "gl"); Signed-off-by: Jeremy Huddleston <[email protected]>
* mesa: merge glapidispatch.h into dispatch.hChia-I Wu2011-06-083-14/+13
| | | | | | | | | glapidispatch.h was located in glapi and shared with mesa core. Because the way it was shared, mesa core must include it indirectly via main/dispatch.h. Now that it is no longer needed by glapi and is located in core mesa, merging it with main/dispatch.h to avoid wrong uses.
* mesa: fix GLES remap table setup againChia-I Wu2011-06-081-9/+13
| | | | | | | | | Generate different glapidispatch.h's for GL and GLES. For GLES, we want a local remap table. This reverts commit 5af46e836073d2112b147b524e441bdb808cc128. The commit will break GL remap table setup when main/glapidispatch.h is regenerated.
* glapi: regenerated filesPierre-Eric Pelloux-Prayer2011-06-027-4296/+4371
| | | | Signed-off-by: Brian Paul <[email protected]>
* glapi: add glDrawElementsInstancedBaseVertex() function to xmlBrian Paul2011-06-021-0/+9
| | | | Signed-off-by: Brian Paul <[email protected]>
* glapi: Make xserver location error more helpfulNathan Kidd2011-06-011-1/+4
| | | | | | | glx code hasn't lived under xserver/GL for a long time now. Signed-off-by: Nathan Kidd <[email protected]> Signed-off-by: Brian Paul <[email protected]>