summaryrefslogtreecommitdiffstats
path: root/src/mesa
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-213-11/+49
|\
| * mesa: Fix compiler error.Michal Krol2008-09-191-1/+3
| |
| * mesa: Fix arb parse constantsBrian Paul2008-09-192-9/+38
| |
| * gallium: if we run out of memory in st_TexImage, flush and try again.Brian Paul2008-09-181-2/+9
| | | | | | | | | | If the driver buffers a scene flushing should release old textures and make space for new ones. Fixes problem with texdown.c test.
* | swrast: remove merge droppingsKeith Whitwell2008-09-211-5/+0
| |
* | swrast: remove dead file not present in masterKeith Whitwell2008-09-211-36/+0
| |
* | 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-21423-1562/+1576
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2150-336/+327
| | |
| * | 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.
| * | mesa: remove unneeded s_drawpix.h headerBrian2008-09-182-36/+0
| | |
| * | mesa: fix asst path/include mistakes in prev commitsChris Rankin2008-09-184-4/+4
| | |
| * | 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
| | |
| * | 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...
* | | mesa: add missing FEATURE_attrib_stack aroundAlan Hourihane2008-09-191-0/+2
| | | | | | | | | | | | call to _mesa_free_attrib_data()
* | | bug fix to MSAA visualsAlan Hourihane2008-09-191-3/+1
| | |
* | | re-add MSAA supportAlan Hourihane2008-09-192-67/+71
| | |
* | | Merge commit 'origin/gallium-0.1' into gallium-0.2Keith Whitwell2008-09-1812-41/+129
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: src/mesa/shader/slang/slang_link.c
| * | gallium: fix fog vs. pointcoord attribute handling in mesa->TGSI conversionBrian Paul2008-09-171-1/+4
| | |
| * | mesa: new gl_fragment_program fields indicating use of fog, front-facing, ↵Brian Paul2008-09-172-19/+36
| | | | | | | | | | | | point coord
| * | gallium: clean-up/fix msaa override in state trackerBrian Paul2008-09-174-7/+27
| | |
| * | mesa: update program->NumAddressRegs field in _slang_update_inputs_outputs()Brian Paul2008-09-171-0/+9
| | |
| * | gallium: include prog_print.h to silence warningBrian Paul2008-09-171-0/+1
| | |
| * | gallium: need to finish, not flush, in st_copy_texsubimage()Brian Paul2008-09-171-1/+2
| | |
| * | gallium: new assertion on surface->textureBrian Paul2008-09-171-0/+1
| | |
| * | tgsi: Add a ugly fix for CONSTANT problemsJakob Bornecrantz2008-09-171-0/+9
| | |
| * | tgsi: More debug printing on sanity check errorJakob Bornecrantz2008-09-171-2/+5
| | |
| * | mesa: fix bug in previous changes to _slang_resolve_attributes()Brian Paul2008-09-171-1/+3
| | |
| * | mesa: rework GLSL vertex attribute bindingBrian Paul2008-09-164-103/+110
| | | | | | | | | | | | | | | | | | | | | Calls to glBindAttribLocation() should not take effect until the next time that glLinkProgram() is called. gl_shader_program::Attributes now just contains user-defined bindings. gl_shader_program::VertexProgram->Attributes contains the actual/final bindings.
| * | gallium: fix glTexImage(width=height=depth=0) caseBrian Paul2008-09-161-0/+5
| | | | | | | | | | | | Free old teximage/level data, then stop.
| * | mesa: fix display list regression (check if save->prim_count > 0 in ↵Brian Paul2008-09-161-5/+7
| | | | | | | | | | | | vbo_save_EndList())
| * | mesa: fix bug in get_uniform_rows_cols(): sometimes returned too many rowsBrian Paul2008-09-161-6/+13
| | |
| * | gallium: move _vbo_DestroyContext() callBrian Paul2008-09-161-2/+2
| | | | | | | | | | | | Call it before freeing core Mesa state to avoid references to freed buffer objects.
| * | mesa: protect against double-free in _vbo_DestroyContext()Brian Paul2008-09-161-4/+6
| | |
| * | mesa: State tracker now checks for faulty shaders on debugJakob Bornecrantz2008-09-161-1/+12
| | |
| * | mesa: fix MSAA enable state in update_multisample()Brian Paul2008-09-151-4/+4
| | |
| * | mesa: remove some assertions that are invalid during context tear-downBrian Paul2008-09-151-1/+4
| | |
| * | mesa: get another class of degenerate dlists workingKeith Whitwell2008-09-152-2/+29
| | | | | | | | | | | | Primitive begin in one dlist, end in another.
* | | Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-09-1821-186/+218
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c