aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* drivers/x11: remove early gallium supportKeith Whitwell2008-09-218-1074/+198
| | | | | | | | | We originally piggy-backed gallium development in the X11/swrast driver, but the necessary code has since been moved to its own location in gallium/winsys/xlib. Remove the old code from here as we don't want it propogated back to master in any future merge.
* state_tracker: remove dead fileKeith Whitwell2008-09-211-319/+0
|
* gallium: remove files not in masterKeith Whitwell2008-09-217-2029/+2
| | | | Remove git droppings we've accumulated somehow.
* gallium: remove remnants of an nouveau driverKeith Whitwell2008-09-215-1029/+0
| | | | This isn't present on master, so probably shouldn't be here either.
* swrast: remove merge droppingsKeith Whitwell2008-09-211-4/+0
|
* Merge branch 'master' into gallium-0.2Keith Whitwell2008-09-210-0/+0
|\
| * Remove CVS keywords.Keith Whitwell2008-09-21543-685/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from gallium-0.1 Conflicts: 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/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/tdfx/tdfx_dd.h
* | Merge branch 'master' into gallium-0.2Keith Whitwell2008-09-210-0/+0
|\|
| * mesa: Prefix main includes with dir to avoid conflicts.José Fonseca2008-09-213-4/+4
| | | | | | | | Eliminate a couple of differences with gallium-0.2
* | Merge branch 'master' into gallium-0.2Keith Whitwell2008-09-210-0/+0
|\|
| * mesa: remove dead fileKeith Whitwell2008-09-212-43/+0
| |
| * mesa: add explict float castsKeith Whitwell2008-09-211-48/+48
| |
* | Merge branch 'master' into gallium-0.2Keith Whitwell2008-09-21570-5948/+5419
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: move fixed function vertex program builder from tnl to core mesaKeith Whitwell2008-09-2117-1797/+2207
| | | | | | | | | | | | Also unify caching of fragment and vertex programs in shader/prog_cache.c` Brought across from gallium-0.2
| * mesa: add parenthesisBrian Paul2008-09-211-3/+3
| | | | | | | | (cherry picked from commit c366fd83b617db6c8c064802ff4bf120d654507d)
| * mesa: standardize on C99's uint*_t instead of u_int*_tKeith Whitwell2008-09-2153-353/+344
| |
| * mesa: Remove assyntax.h include from generated matypes.h.José Fonseca2008-09-2117-3/+17
| | | | | | | | | | | | | | matypes.h doesn't really depend on assyntax.h; assyntax.h is only present on x86; and this way we remove the need of grep being available (which is relevant for scons and non-unix platforms). (cherry picked from commit fc286ff3ba089af5f1aca2d35b93b53a9383b1cf)
| * mesa: move rastpos helper to tnlKeith Whitwell2008-09-216-529/+552
| |
| * mesa: improved driver query interfaceKeith Whitwell2008-09-217-69/+100
| | | | | | | | Brought over from gallium-0.2 branch.
| * Update to SGI FreeB 2.0.Adam Jackson2008-09-19135-4442/+3780
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Under the terms of version 1.1, "once Covered Code has been published under a particular version of the License, Recipient may, for the duration of the License, continue to use it under the terms of that version, or choose to use such Covered Code under the terms of any subsequent version published by SGI." FreeB 2.0 license refers to "dates of first publication". They are here taken to be 1991-2000, as noted in the original license text: ** Original Code. The Original Code is: OpenGL Sample Implementation, ** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, ** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. ** Copyright in any portions created by third parties is as indicated ** elsewhere herein. All Rights Reserved. Official FreeB 2.0 text: http://oss.sgi.com/projects/FreeB/SGIFreeSWLicB.2.0.pdf As always, this code has not been tested for conformance with the OpenGL specification. OpenGL conformance testing is available from http://khronos.org/ and is required for use of the OpenGL logo in product advertising and promotion.
| * glx: re-add glapi/ pathBrian2008-09-181-0/+1
| |
| * mesa: remove unneeded s_drawpix.h headerBrian2008-09-182-36/+0
| |
| * glx: added "glapi/" prefix to includeBrian2008-09-181-1/+1
| |
| * mesa: fix asst path/include mistakes in prev commitsChris Rankin2008-09-185-5/+5
| |
| * mesa: fix null ptr deref bug in _tnl_InvalidateState(), bug 15834Brian Paul2008-09-181-6/+14
| |
| * mesa: added "main/" prefix to includes, remove some -I paths from ↵Brian Paul2008-09-18344-1299/+1296
| | | | | | | | Makefile.template
| * mesa: prefix more #includes with "main/"Brian Paul2008-09-1825-132/+132
| |
| * mesa: remove a bunch of -I paths from INCLUDE_DIRSBrian Paul2008-09-181-9/+1
| |
| * glx: remove #include "glheader.h" linesBrian Paul2008-09-1815-15/+21
| | | | | | | | | | Was only used to get the PUBLIC/USED macros. Also, replace "GL_FALSE" with "False" in a couple places.
| * glx: remove depency on glheader.h and GLboolean type in XF86DRI codeBrian Paul2008-09-182-8/+18
| | | | | | | | | | Return Bool instead of GLboolean to match other functions. Define PUBLIC/USED macros locally.
| * mesa: prefix a bunch of #include lines with "main/".Brian Paul2008-09-18105-388/+381
| | | | | | | | | | This is another step toward removing a whole bunch of -I flags from the cc commands. Still need to address driver code...
* | cell: use different opcodes for spe_move() depending on even/odd addressBrian Paul2008-09-191-1/+7
| |
* | cell: make sure the fragment ops and fragment shader code buffer is at a ↵Brian Paul2008-09-192-5/+7
| | | | | | | | | | | | 32-byte boundary To make sure even/odd instructions hit the right pipes.
* | gallium: added ALIGN32_ATTRIBBrian Paul2008-09-191-0/+2
| |
* | gallium: added spe_code_size()Brian Paul2008-09-192-0/+8
| |
* | cell: Added FRC instructionJonathan White2008-09-191-0/+41
| |
* | cell: Added FLR instruction. Verified the following instructions match ↵Jonathan White2008-09-191-9/+20
| | | | | | | | softpipe: MOV, ADD, MUL, SGE, SUB, MAD, ABS, SLT, MIN, MAX, LRP, DP3, DP4, CMP, FLR
* | cell: Fixed bugs with DP3 and DP4, they match softpipe results now.Jonathan White2008-09-191-3/+37
| |
* | cell: flesh out support for other Z/stencil formatBrian Paul2008-09-191-36/+64
| | | | | | | | | | Also: improve float/int Z conversion. Use clgt instead of cgt in depth test since we're comparing unsigned values.
* | cell: issue warning to stderr when using fallback fragment opsBrian Paul2008-09-191-1/+9
| |
* | cell: fix a commentBrian Paul2008-09-191-1/+1
| |
* | cell: the test for CELL_DEBUG_FRAGMENT_OP_FALLBACK in ↵Brian Paul2008-09-191-1/+1
| | | | | | | | cmd_state_fragment_ops() was inverted
* | cell: disable XShmPutImage for tiled surface for nowBrian Paul2008-09-191-2/+2
| | | | | | | | Multiple displays of same surface data causes pixels to get scrambled.
* | cell: change spe_complement() to take a src and dst reg, like other instructionsBrian Paul2008-09-194-12/+14
| |
* | Merge branch 'gallium-0.2' of ssh+git://git.freedesktop.org/git/mesa/mesa ↵José Fonseca2008-09-197-81/+240
|\ \ | | | | | | | | | into gallium-0.2
| * | mesa: add missing FEATURE_attrib_stack aroundAlan Hourihane2008-09-191-0/+2
| | | | | | | | | | | | call to _mesa_free_attrib_data()
| * | i915simple: Use defined MSAA arrayJakob Bornecrantz2008-09-191-1/+1
| | |
| * | bug fix to MSAA visualsAlan Hourihane2008-09-191-3/+1
| | |
| * | fix for MSAAAlan Hourihane2008-09-191-1/+1
| | |
| * | re-add MSAA supportAlan Hourihane2008-09-192-67/+71
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-12 00:23:05 +0000