aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/glapi
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into gallium-0.2Keith Whitwell2008-09-211-0/+16
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/GLES/egl.h include/GLES/egltypes.h src/egl/main/eglconfig.c src/egl/main/eglconfig.h src/glu/sgi/libnurbs/interface/bezierEval.h src/glu/sgi/libnurbs/interface/bezierPatch.h src/glu/sgi/libnurbs/interface/bezierPatchMesh.h src/glu/sgi/libnurbs/internals/dataTransform.h src/glu/sgi/libnurbs/internals/displaymode.h src/glu/sgi/libnurbs/internals/sorter.h src/glu/sgi/libnurbs/nurbtess/definitions.h src/glu/sgi/libnurbs/nurbtess/directedLine.h src/glu/sgi/libnurbs/nurbtess/gridWrap.h src/glu/sgi/libnurbs/nurbtess/monoChain.h src/glu/sgi/libnurbs/nurbtess/monoPolyPart.h src/glu/sgi/libnurbs/nurbtess/monoTriangulation.h src/glu/sgi/libnurbs/nurbtess/partitionX.h src/glu/sgi/libnurbs/nurbtess/partitionY.h src/glu/sgi/libnurbs/nurbtess/polyDBG.h src/glu/sgi/libnurbs/nurbtess/polyUtil.h src/glu/sgi/libnurbs/nurbtess/primitiveStream.h src/glu/sgi/libnurbs/nurbtess/quicksort.h src/glu/sgi/libnurbs/nurbtess/rectBlock.h src/glu/sgi/libnurbs/nurbtess/sampleComp.h src/glu/sgi/libnurbs/nurbtess/sampleCompBot.h src/glu/sgi/libnurbs/nurbtess/sampleCompRight.h src/glu/sgi/libnurbs/nurbtess/sampleCompTop.h src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.h src/glu/sgi/libnurbs/nurbtess/sampledLine.h src/glu/sgi/libnurbs/nurbtess/searchTree.h src/glu/sgi/libnurbs/nurbtess/zlassert.h src/glu/sgi/libutil/error.c src/glu/sgi/libutil/glue.c src/glu/sgi/libutil/gluint.h src/glu/sgi/libutil/project.c src/glu/sgi/libutil/registry.c src/glx/x11/Makefile src/glx/x11/glxclient.h src/glx/x11/glxext.c src/mesa/drivers/dri/ffb/ffb_dd.h src/mesa/drivers/dri/ffb/ffb_points.h src/mesa/drivers/dri/gamma/gamma_context.h src/mesa/drivers/dri/gamma/gamma_macros.h src/mesa/drivers/dri/i810/i810context.h src/mesa/drivers/dri/r128/r128_dd.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/tdfx/tdfx_dd.h src/mesa/drivers/x11/xm_buffer.c src/mesa/glapi/glapi.c src/mesa/main/dispatch.c src/mesa/main/state.c src/mesa/main/texstate.c src/mesa/shader/arbprogparse.c src/mesa/shader/arbprogram.c src/mesa/shader/nvfragparse.c src/mesa/shader/nvprogram.c src/mesa/shader/shader_api.c src/mesa/sources src/mesa/swrast/s_aaline.c src/mesa/swrast/s_aaline.h src/mesa/swrast/s_aatriangle.h src/mesa/swrast/s_accum.c src/mesa/swrast/s_alpha.h src/mesa/swrast/s_bitmap.c src/mesa/swrast/s_blend.h src/mesa/swrast/s_context.c src/mesa/swrast/s_copypix.c src/mesa/swrast/s_depth.c src/mesa/swrast/s_depth.h src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_drawpix.h src/mesa/swrast/s_feedback.c src/mesa/swrast/s_feedback.h src/mesa/swrast/s_fog.h src/mesa/swrast/s_lines.h src/mesa/swrast/s_logic.h src/mesa/swrast/s_masking.h src/mesa/swrast/s_points.c src/mesa/swrast/s_points.h src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast/s_span.h src/mesa/swrast/s_stencil.h src/mesa/swrast/s_texcombine.c src/mesa/swrast/s_texcombine.h src/mesa/swrast/s_texfilter.c src/mesa/swrast/s_texfilter.h src/mesa/swrast/s_texstore.c src/mesa/swrast/s_triangle.c src/mesa/swrast/s_triangle.h src/mesa/swrast/s_zoom.h src/mesa/swrast_setup/ss_context.c src/mesa/swrast_setup/ss_triangle.h src/mesa/tnl/t_draw.c src/mesa/tnl/t_vb_light.c src/mesa/tnl/t_vertex_generic.c src/mesa/tnl/t_vertex_sse.c src/mesa/tnl/t_vp_build.h src/mesa/tnl/tnl.h src/mesa/x86/common_x86.c
| * mesa: fix asst path/include mistakes in prev commitsChris Rankin2008-09-181-1/+1
| |
| * mesa: prefix a bunch of #include lines with "main/".Brian Paul2008-09-181-1/+1
| | | | | | | | | | This is another step toward removing a whole bunch of -I flags from the cc commands. Still need to address driver code...
* | Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-09-181-0/+3
|\| | | | | | | | | | | | | Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
| * mesa: #include <stdio.h>Guillaume Melquiond2008-09-131-0/+1
| |
* | tree buildsAlan Hourihane2008-09-113-469/+5
| |
* | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-1110-224/+713
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A first attempt at moving gallium onto a branch directly off master... It will be interesting to see how much work this takes to get running. Have resolved the conflicts semi-arbitarily, not compiled or tested. Conflicts: .gitignore Makefile configs/config.mgw configs/darwin configs/darwin-x86ppc configs/default configs/freebsd-dri configs/linux-dri configs/linux-dri-xcb configs/linux-fbdev configs/linux-static configs/linux-x86-64-static configs/linux-x86-static doxygen/Makefile include/GL/gl.h progs/demos/Makefile progs/demos/descrip.mms progs/demos/texenv.c progs/egl/.gitignore progs/egl/Makefile progs/glsl/.gitignore progs/glsl/Makefile progs/glsl/convolutions.c progs/samples/Makefile.mgw progs/tests/.gitignore progs/trivial/.gitignore progs/trivial/point-param.c progs/trivial/tri.c progs/xdemos/.gitignore progs/xdemos/glthreads.c src/egl/drivers/demo/Makefile src/egl/drivers/dri/Makefile src/egl/main/Makefile src/glu/Makefile src/glu/sgi/Makefile src/glu/sgi/Makefile.mgw src/glut/glx/Makefile.mgw src/glut/os2/WarpWin.cpp src/glut/os2/glut_cindex.cpp src/glut/os2/glut_gamemode.cpp src/glut/os2/glut_win.cpp src/glut/os2/glut_winmisc.cpp src/glut/os2/os2_glx.cpp src/glut/os2/os2_menu.cpp src/glut/os2/os2_winproc.cpp src/glw/Makefile src/glx/x11/dri_glx.c src/glx/x11/glxext.c src/mesa/Makefile src/mesa/Makefile.mgw src/mesa/descrip.mms src/mesa/drivers/beos/Makefile src/mesa/drivers/common/descrip.mms src/mesa/drivers/common/driverfuncs.c src/mesa/drivers/directfb/Makefile src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/common/dri_bufmgr.c src/mesa/drivers/dri/common/dri_bufmgr.h src/mesa/drivers/dri/common/dri_util.c src/mesa/drivers/dri/common/extension_helper.h src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/utils.c src/mesa/drivers/dri/common/utils.h src/mesa/drivers/dri/glcore/Makefile src/mesa/drivers/dri/i810/i810screen.c src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/drivers/dri/i915/intel_ioctl.h src/mesa/drivers/dri/i915/intel_screen.c src/mesa/drivers/dri/i915/server/i830_common.h src/mesa/drivers/dri/i915/server/i830_dri.h src/mesa/drivers/dri/i965/intel_screen.c src/mesa/drivers/dri/i965/server/i830_common.h src/mesa/drivers/dri/i965/server/i830_dri.h src/mesa/drivers/dri/mach64/mach64_screen.c src/mesa/drivers/dri/nouveau/nouveau_context.h src/mesa/drivers/dri/nouveau/nouveau_fifo.c src/mesa/drivers/dri/nouveau/nouveau_fifo.h src/mesa/drivers/dri/nouveau/nouveau_screen.c src/mesa/drivers/dri/nouveau/nouveau_screen.h src/mesa/drivers/dri/r128/r128_tex.h src/mesa/drivers/dri/savage/savageioctl.h src/mesa/drivers/fbdev/Makefile src/mesa/drivers/osmesa/Makefile src/mesa/drivers/osmesa/descrip.mms src/mesa/drivers/x11/Makefile src/mesa/drivers/x11/descrip.mms src/mesa/drivers/x11/xm_dd.c src/mesa/glapi/glapi.c src/mesa/glapi/glthread.c src/mesa/main/api_validate.c src/mesa/main/attrib.c src/mesa/main/bufferobj.c src/mesa/main/bufferobj.h src/mesa/main/buffers.c src/mesa/main/config.h src/mesa/main/context.c src/mesa/main/descrip.mms src/mesa/main/drawpix.c src/mesa/main/enums.c src/mesa/main/fbobject.c src/mesa/main/glheader.h src/mesa/main/imports.c src/mesa/main/mipmap.c src/mesa/main/mm.c src/mesa/main/mm.h src/mesa/main/mtypes.h src/mesa/main/points.c src/mesa/main/sources src/mesa/main/state.c src/mesa/main/texcompress_fxt1.c src/mesa/main/texenvprogram.c src/mesa/main/texobj.c src/mesa/main/texstate.c src/mesa/main/texstore.c src/mesa/math/descrip.mms src/mesa/shader/arbprogram.c src/mesa/shader/descrip.mms src/mesa/shader/prog_execute.c src/mesa/shader/prog_statevars.c src/mesa/shader/prog_statevars.h src/mesa/shader/prog_uniform.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/shader_api.c src/mesa/shader/slang/descrip.mms src/mesa/shader/slang/library/slang_vertex_builtin_gc.h src/mesa/sources src/mesa/swrast/descrip.mms src/mesa/swrast/s_drawpix.c src/mesa/swrast/s_fragprog.c src/mesa/swrast/s_readpix.c src/mesa/swrast/s_span.c src/mesa/swrast_setup/descrip.mms src/mesa/tnl/descrip.mms src/mesa/tnl/t_context.h src/mesa/tnl/t_vp_build.c src/mesa/tnl/tnl.h src/mesa/vbo/descrip.mms src/mesa/vbo/vbo_context.c src/mesa/vbo/vbo_exec_array.c src/mesa/x86-64/xform4.S src/mesa/x86/rtasm/x86sse.c src/mesa/x86/rtasm/x86sse.h windows/VC6/progs/glut/glut.dsp windows/VC7/mesa/gdi/gdi.vcproj windows/VC7/mesa/glu/glu.vcproj windows/VC7/mesa/mesa.sln windows/VC7/mesa/mesa/mesa.vcproj windows/VC7/mesa/osmesa/osmesa.vcproj windows/VC7/progs/glut/glut.vcproj windows/VC8/mesa/gdi/gdi.vcproj windows/VC8/mesa/glu/glu.vcproj windows/VC8/mesa/mesa.sln windows/VC8/mesa/mesa/mesa.vcproj windows/VC8/progs/glut/glut.vcproj
| * mesa: Prefix main includes with dir to avoid conflicts.José Fonseca2008-07-243-3/+3
| | | | | | | | | | Some of the headers in src/mesa/main have pretty common names which easily conflict with third-party code, e.g. config.h
| * mesa: return -1, not GL_FALSE if _glapi_add_dispatch() fails name sanity checkBrian Paul2008-07-091-2/+2
| |
| * mesa: Replace abort by asserts.José Fonseca2008-06-241-5/+5
| |
| * mesa: No getenv on WinCE.José Fonseca2008-06-241-0/+4
| |
| * mesa: add fwd decl of fill_in_entrypoint_offset()Brian Paul2008-06-181-0/+4
| |
| * mesa: refactor: move GetProcAddress code from glapi.c into new ↵Brian Paul2008-06-183-624/+655
| | | | | | | | glapi_getproc.c file
| * mesa: move some glapi bits aroundBrian Paul2008-06-134-3/+7
| | | | | | | | | | | | Move _glapi_proc typedef from glapitable.h to glapi.h Also, don't include glapitable.h from glapi.h Before we were including the huge glapitable.h file in every .c file.
| * Remove CVS keywords.José Fonseca2008-05-261-1/+0
| |
| * Merge branch 'gallium-i915-current' into gallium-0.1Jakob Bornecrantz2008-05-231-4/+44
| |\
| | * mesa: Pulled in glthread from i915texJakob Bornecrantz2008-04-071-4/+44
| | |
| * | mesa: fix #include path for glapioffsets.h (fixes x86 build)Brian2008-05-211-1/+1
| | |
| * | Regenerated API dispatch filesBrian Paul2008-05-185-630/+590
| | | | | | | | | | | | Follow on to cherry-pick from master
| * | alias ProgramEnvParameter4xyARB and ProgramParameter4xyNV (bug #12935)Brian Paul2008-05-181-8/+6
| |/ | | | | | | | | | | these should be the same functions (as per spec). cherry-picked from master (86a4810b09097714942bf2b889e6c62357bba931)
| * Alias glStencilOpSeparateATI with glStencilOpSeparate.Brian2008-04-046-143/+130
| |
| * Finish up ATI_separate_stencilBrian2008-04-046-300/+373
| | | | | | | | | | | | Add entrypoints to glapi XML file and regenerate files. Implement glStencilOpSeparateATI(). Consolidate some code in stencil.c
| * Remove files of unsupported build systems.José Fonseca2008-02-251-37/+0
| |
| * gallium: s/GLuint/unsigned/ to work with gallium when THREADS not definedBrian2008-01-261-3/+3
| |
| * Rename 'mms-config.' to 'mms.config'.Michal Krol2007-10-291-1/+1
| | | | | | | | | | It looks like Windows does not like filenames ending with a dot, in effect renaming it to 'mms-config'.
* | mesa: return -1, not GL_FALSE if _glapi_add_dispatch() fails name sanity checkBrian Paul2008-07-091-2/+2
| |
* | Bring over commit 8d4d0b47a07a298a20ffae9fefe96c8c7ca9dccc from xserver treePaulo Cesar Pereira de Andrade2008-07-021-0/+3
| |
* | VBO: Add missing functions related to VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARBIan Romanick2008-07-011-0/+2
| |
* | VBO: add GLX related annotationsIan Romanick2008-07-011-29/+59
| |
* | Follow along GL/glx -> glx renaming in xserverDan Nicholson2008-05-211-2/+2
| | | | | | | | | | The xserver glx modules were lifted up to the top level, so this changes the glapi generation to look in the new location.
* | Add remaining glapi generated server headers.Kristian Høgsberg2008-05-211-12/+35
| | | | | | | | | | | | | | | | This adds all the headers needed by the xserver glx module and also adds a rule to copy over the shared glapi.[ch] and glthread.[ch] files. Specifying an xserver path (set XORG_BASE on the make command line) is now mandatory when regenerating the glapi files.
* | Make the shared glapi files not include glheader.h.Kristian Høgsberg2008-05-213-6/+15
| |
* | Revert "glapi: Generate xserver glapi sources in the mesa tree"Kristian Høgsberg2008-05-211-13/+18
| | | | | | | | | | | | | | | | | | This reverts commit 7688791fc52f116eea421fda1d17aba5cf10977b, and takes us back to generating the glapi files straight into the xserver tree. Conflicts: src/glx/x11/indirect_size_get.c
* | Never fail `make clean'Dan Nicholson2008-05-071-2/+2
| | | | | | | | | | | | Mostly some pedantic changes such that `make clean' always ignores errors. Also changed the top clean target to do the `touch configs/current' dance instead of realclean.
* | glcore: drop outdated sources files intented for xorgGeorge Sapountzis2008-04-231-12/+0
| |
* | glcore: build from mesaGeorge Sapountzis2008-04-232-0/+8
| |
* | Move DRI context functions into dri_glx.c.Kristian Høgsberg2008-03-081-1/+1
| | | | | | | | Also drop isDirect flag; if gc->driContext is non-NULL, it's direct.
* | Added <size name="Get" mode="get"/> lines for point parameter tokens.Brian2008-02-191-0/+4
| | | | | | | | | | See bug 11893. This allows GL_POINT_SIZE_MIN/MAX/etc to be queried with indirect rendering.
* | If parameter is a 'counter', raise GL_INVALID_VALUE if value is negativeBrian2008-02-191-0/+8
| | | | | | | | Fixes bug 10984.
* | glapi: Generate xserver glapi sources in the mesa treeDan Nicholson2008-02-171-18/+13
| | | | | | | | | | | | | | | | | | Instead of generating the glapi sources for the xserver and commiting them to the xserver tree, we can keep them in the mesa tree and change the xserver build to use the files from the mesa tree. This makes the xserver glx build more robust as it reduces the chances for mismatches of the glX API used in the xserver vs. in mesa.
* | glapi: Correct prerequisites for gl_and_glX_API.xmlDan Nicholson2008-02-121-2/+2
| | | | | | | | | | | | | | The indirect_dispatch.h and indirect_table.c source files use gl_and_glX_API.xml in their generation rather than glX_API.xml, but it wasn't listed in their prerequisites. In turn, gl_and_glX_API.xml uses glX_API.xml, but this is already listed in $(COMMON_GLX).
* | glapi: Use make automatic variables to clean up the commandsDan Nicholson2008-02-121-46/+50
| | | | | | | | | | | | | | Make use of the make automatic variables $@ (the target) and $< (first prerequisite) to clean up the commands for the glapi generation. This improves readability and guards against typos since words are repeated less frequently.
* | glapi: Use variable for indent and flagsDan Nicholson2008-02-121-9/+7
| | | | | | | | | | | | Put the path to indent and the flags to call it with in configs/default rather than in the Makefile. This makes it easier to change the values globally.
* | added 'get' info for framebuffer object tokensBrian2008-01-012-8/+18
| |
* | add 'Get' info for MAX_3D_TEXTURE_SIZE (for bug 13811)Brian2008-01-011-1/+3
| |
* | recreate from changed gl_API.xmlRoland Scheidegger2007-11-095-630/+590
| |
* | alias ProgramEnvParameter4xyARB and ProgramParameter4xyNV (bug #12935)Roland Scheidegger2007-11-091-8/+6
| | | | | | | | these should be the same functions (as per spec).
* | Prevent loss of vectorequiv information when an alias follows the function ↵Ian Romanick2007-11-081-43/+48
| | | | | | | | being aliased.
* | Fix some build warnings, mostly with XCB.Michel Dänzer2007-10-301-5/+9
| |
* | Alias glStencilOpSeparateATI with glStencilOpSeparate.Brian2007-10-306-143/+130
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 03:47:34 +0000