summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-09-21Merge branch 'master' into gallium-0.2Keith Whitwell
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
2008-09-21mesa: move fixed function vertex program builder from tnl to core mesaKeith Whitwell
Also unify caching of fragment and vertex programs in shader/prog_cache.c` Brought across from gallium-0.2
2008-09-21mesa: add parenthesisBrian Paul
(cherry picked from commit c366fd83b617db6c8c064802ff4bf120d654507d)
2008-09-21mesa: standardize on C99's uint*_t instead of u_int*_tKeith Whitwell
2008-09-21mesa: Remove assyntax.h include from generated matypes.h.José Fonseca
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)
2008-09-21mesa: move rastpos helper to tnlKeith Whitwell
2008-09-21mesa: improved driver query interfaceKeith Whitwell
Brought over from gallium-0.2 branch.
2008-09-19cell: use different opcodes for spe_move() depending on even/odd addressBrian Paul
2008-09-19cell: make sure the fragment ops and fragment shader code buffer is at a ↵Brian Paul
32-byte boundary To make sure even/odd instructions hit the right pipes.
2008-09-19gallium: added ALIGN32_ATTRIBBrian Paul
2008-09-19gallium: added spe_code_size()Brian Paul
2008-09-19Update to SGI FreeB 2.0.Adam Jackson
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.
2008-09-19cell: Added FRC instructionJonathan White
2008-09-19cell: Added FLR instruction. Verified the following instructions match ↵Jonathan White
softpipe: MOV, ADD, MUL, SGE, SUB, MAD, ABS, SLT, MIN, MAX, LRP, DP3, DP4, CMP, FLR
2008-09-19cell: Fixed bugs with DP3 and DP4, they match softpipe results now.Jonathan White
2008-09-19cell: flesh out support for other Z/stencil formatBrian Paul
Also: improve float/int Z conversion. Use clgt instead of cgt in depth test since we're comparing unsigned values.
2008-09-19cell: issue warning to stderr when using fallback fragment opsBrian Paul
2008-09-19cell: fix a commentBrian Paul
2008-09-19cell: the test for CELL_DEBUG_FRAGMENT_OP_FALLBACK in ↵Brian Paul
cmd_state_fragment_ops() was inverted
2008-09-19cell: disable XShmPutImage for tiled surface for nowBrian Paul
Multiple displays of same surface data causes pixels to get scrambled.
2008-09-19cell: change spe_complement() to take a src and dst reg, like other instructionsBrian Paul
2008-09-19Merge branch 'gallium-0.2' of ssh+git://git.freedesktop.org/git/mesa/mesa ↵José Fonseca
into gallium-0.2
2008-09-19util: Use OpenGL rasterization rules in blits and mipmap generation.José Fonseca
2008-09-19mesa: add missing FEATURE_attrib_stack aroundAlan Hourihane
call to _mesa_free_attrib_data()
2008-09-19i915simple: Use defined MSAA arrayJakob Bornecrantz
2008-09-19bug fix to MSAA visualsAlan Hourihane
2008-09-19fix for MSAAAlan Hourihane
2008-09-19re-add MSAA supportAlan Hourihane
2008-09-19i915simple: Front flushing does workJakob Bornecrantz
2008-09-19i915simple: Fix extentions being loadedJakob Bornecrantz
2008-09-19CELL: add codegen for logic op, color maskRobert Ellison
- rtasm_ppc_spe.c, rtasm_ppc_spe.h: added a new macro function "spe_load_uint" for loading and splatting unsigned integers in a register; it will use "ila" for values 18 bits or less, "ilh" for word values that are symmetric across halfwords, "ilhu" for values that have zeroes in their bottom halfwords, or "ilhu" followed by "iohl" for general 32-bit values. Of the 15 color masks of interest, 4 are 18 bits or less, 2 are symmetric across halfwords, 3 are zero in the bottom halfword, and 6 require two instructions to load. - cell_gen_fragment.c: added full codegen for logic op and color mask.
2008-09-18glx: re-add glapi/ pathBrian
2008-09-18mesa: remove unneeded s_drawpix.h headerBrian
2008-09-18glx: added "glapi/" prefix to includeBrian
2008-09-19gallium: Fix doxygen comments.José Fonseca
2008-09-19softpipe: Obey const qualifier.José Fonseca
2008-09-18mesa: fix asst path/include mistakes in prev commitsChris Rankin
2008-09-18CELL: mark several transient files as .gitignoreRobert Ellison
progs/demos: added new demo "fbo_firecube" progs/glsl: added new demo "pointcoord" src/gallium/drivers/cell/spu: added the g3d_spu executable, a Cell SPU executable file, which seems to be occasionally built as part of the cell driver src/glu/sgi: added "exptmp", a byproduct of the "mklib" process that sometimes gets deleted and sometimes not.
2008-09-18mesa: fix null ptr deref bug in _tnl_InvalidateState(), bug 15834Brian Paul
2008-09-18mesa: added "main/" prefix to includes, remove some -I paths from ↵Brian Paul
Makefile.template
2008-09-18cell: Added CMP instructionJonathan White
2008-09-18mesa: prefix more #includes with "main/"Brian Paul
2008-09-18mesa: remove a bunch of -I paths from INCLUDE_DIRSBrian Paul
2008-09-18glx: remove #include "glheader.h" linesBrian Paul
Was only used to get the PUBLIC/USED macros. Also, replace "GL_FALSE" with "False" in a couple places.
2008-09-18glx: remove depency on glheader.h and GLboolean type in XF86DRI codeBrian Paul
Return Bool instead of GLboolean to match other functions. Define PUBLIC/USED macros locally.
2008-09-18mesa: prefix a bunch of #include lines with "main/".Brian Paul
This is another step toward removing a whole bunch of -I flags from the cc commands. Still need to address driver code...
2008-09-18Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell
Conflicts: src/mesa/shader/slang/slang_link.c
2008-09-18Merge commit 'origin/master' into gallium-0.2Keith Whitwell
Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
2008-09-18mesa: bring sources into line with sources.mak, but omit gallium codeKeith Whitwell
2008-09-18dri/swrast: fix swapBuffers after dri2George Sapountzis
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 18:24:01 +0000