summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/glheader.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into gallium-0.2Alan Hourihane2009-01-141-1/+2
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: docs/install.html docs/relnotes-7.3.html src/mesa/shader/slang/slang_codegen.c src/mesa/shader/slang/slang_compile.c src/mesa/shader/slang/slang_emit.c src/mesa/shader/slang/slang_preprocess.c src/mesa/shader/slang/slang_preprocess.h
| * Big endian fixes.Matthieu Herrb2009-01-111-1/+2
| |
| * mesa: texture crop rect stateBrian Paul2008-09-211-0/+4
| | | | | | | | (cherry picked from commit c01fbc7866d7cd5cf4263dffec6d9591470b4c23)
| * mesa: point size arraysBrian Paul2008-09-211-0/+10
| |
| * mesa: ASSERT macro is already defined by WinCE headers.José Fonseca2008-09-211-0/+2
| | | | | | | | Even when just the standard headers are used....
| * mesa: initial support for fixed-pt vertex arraysBrian Paul2008-09-211-0/+5
| |
* | Merge branch 'master' into gallium-0.2Keith Whitwell2008-09-211-9/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: standardize on C99's uint*_t instead of u_int*_tKeith Whitwell2008-09-211-9/+0
| |
* | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111-14/+46
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: texture crop rect stateBrian Paul2008-08-121-0/+4
| |
| * mesa: point size arraysBrian Paul2008-06-251-0/+10
| |
| * mesa: Use standard integer types.José Fonseca2008-06-241-9/+26
| | | | | | | | Especially get rid of the non-portable long long.
| * mesa: ASSERT macro is already defined by WinCE headers.José Fonseca2008-06-241-0/+2
| | | | | | | | Even when just the standard headers are used....
| * mesa: initial support for fixed-pt vertex arraysBrian Paul2008-06-201-0/+5
| |
* | mesa: check for __INTERIX to typedef uintptr_tBlair Sadewitz2008-07-151-0/+6
| |
* | Solaris port of Mesa 7.1 with autoconf supportAlan Coopersmith2008-06-211-5/+40
| | | | | | | | Signed-off-by: Brian Paul <[email protected]>
* | glcore: build from mesaGeorge Sapountzis2008-04-231-5/+0
| |
* | fix __builtin_expect() definition test for IBM XLC (sf bug 1909832)Brian2008-03-091-1/+1
| |
* | fixes for bluegene-xlc-osmesa configBrian2007-09-201-1/+1
|/
* Fix a number of MINGW32 issuesZhang2007-07-211-1/+1
|
* a variety of fixes for MingWzhang2007-06-281-0/+3
|
* Drop mesa wrappers for XFree86.George Sapountzis2006-12-211-8/+4
|
* updated tests for defining __FUNCTION__ (Dan Schikore)Brian Paul2006-04-131-3/+6
|
* Include dix-config.h if HAVE_DIX_CONFIG_H is defined. This will be used by theEric Anholt2006-02-151-0/+3
| | | | | X Server to get things like _XSERVER64 (for X headers) and NO_LIBCWRAPPER defined consistently when its builds Mesa internally.
* Add the ability to define NO_LIBCWRAPPER to avoid libcwrapper brain damage.Eric Anholt2006-02-111-1/+1
| | | | | If it's true that libcwrapper usage isn't necessary ever in the DllLoader world, then this code should probbaly all go away.
* don't need LONGLONG typedefsBrian Paul2005-12-081-7/+0
|
* add 64-bit typedefs for portabilityKarl Schultz2005-12-081-0/+7
|
* include stdint.h for BSDBrian Paul2005-11-271-10/+9
|
* fix MinGW problems (bug 4956)Brian Paul2005-11-041-1/+1
|
* additional wrapper updates, bug 4468Brian Paul2005-09-191-41/+0
|
* strip out vestigial #ifdef HAVE_CONFIG_H stanzas, they're confusing theAdam Jackson2005-07-161-5/+0
| | | | modular X build
* Don't #define __FUNCTION__ on a Microsoft C compiler new enough to have it.Karl Schultz2005-07-011-1/+2
|
* Define __FUNCTION__ as a preprocessor symbol in glheader.h if we're notBrian Paul2005-06-191-0/+11
| | | | using GCC or VMS.
* mingw changes (Nolan Leake)Brian Paul2005-06-131-0/+3
|
* Cleanup some Windows junk.Karl Schultz2005-05-241-12/+16
|
* Port Mesa to build on a P64 platform (e.g., Win64). P64 platformsKarl Schultz2005-05-051-1/+8
| | | | | | | | use 64-bit pointers and 32-bit longs. So, operations like casting pointers to unsigned long and back to pointer won't work. glheader.h now includes files to define uintptr_t, which should instead be used for this sort of operation. It is an integer type that is the same size as a pointer.
* removed GL_EXT_framebuffer_object tokensBrian Paul2005-02-081-52/+0
|
* additional work on GL_EXT_framebuffer_objectBrian Paul2005-02-071-0/+52
|
* remove a bunch of temporary #defines, now that glext.h was updatedBrian Paul2005-01-261-46/+1
|
* Fix up glx/x11 to work when built with -fvisibility=hidden.Adam Jackson2004-12-151-0/+5
|
* disable junk for mingwDaniel Borca2004-12-061-0/+2
|
* remove the GLAPI/GLAPIENTRY defines - they're already in gl.hBrian Paul2004-11-271-12/+0
|
* Removed GLCALLBACK stuff - apparently never used anywhere.Brian Paul2004-11-271-14/+0
| | | | Removed GLWINAPI stuff - only used (unnecessarily?) in enums.c
* Started some assorted clean-ups in #defines, typedefs, etc.Brian Paul2004-11-251-42/+30
| | | | Next: move all the Windows/WGL stuff into the drivers/windows/ directory.
* Remove need for defining _MSC_VER when building Mesa for windows withBrian Paul2004-11-081-2/+2
| | | | a non MS C compiler (MinGW). (Gregor Anich)
* added support for GL_ARB_draw_buffersBrian Paul2004-10-021-4/+8
|
* Handle GL_MAX_VERTEX_ATTRIBS_ARB in glGet*().Brian Paul2004-09-131-13/+9
| | | | Define 2.0 point-sprite related tokens in glheader.h (temporary).
* Windows ICD driver code (patch 1014800)Brian Paul2004-08-251-10/+12
|
* First phase of TLS work. At this point SPARC assembly dispatch isIan Romanick2004-06-291-0/+6
| | | | | broken, but it will be fixed "shortly." This is pretty much the same as the patch I sent to the dri-devel list on 22-Jun-2004.
* New glTexImage code.Brian Paul2004-04-221-0/+36
| | | | | | | | The gl_texture_format struct now has a StoreTexImageFunc that's called by glTex[Sub]Image[123]D to convert the user's texture data into the specific texture format layout. Now it's much easier to add new texture formats (like the 16/32-bit floating point formats). The texutil.[ch] and texutil_tmp.h files are obsolete.
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-14 19:06:50 +0000