summaryrefslogtreecommitdiffstats
path: root/src/mesa/sources
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into gallium-0.2Brian Paul2008-12-161-1/+2
|\
| * mesa: rename slang_library_noise.[ch] to prog_noise.[ch] and rename functionsBrian Paul2008-12-151-1/+1
| | | | | | | | | | The noise functions were not glsl-specific. Also, ran indent on the code to clean it up.
| * mesa: move _mesa_dlopen(), etc into separate dlopen.c fileBrian Paul2008-12-151-0/+1
| |
| * mesa: refactor: move GetProcAddress code from glapi.c into new ↵Brian Paul2008-09-231-0/+1
| | | | | | | | glapi_getproc.c file
| * mesa: refactor: move glTexParameter-related functions into new texparam.c fileBrian Paul2008-09-211-0/+1
| |
| * mesa: refactor: move glTexEnv-related functions into new texenv.c fileBrian Paul2008-09-211-0/+1
| | | | | | | | (cherry picked from commit 7ecac78ab53016ae3db3dd601b187cb050037463)
| * mesa: refactor: move glTexGen-related functions into new texgen.c fileBrian Paul2008-09-211-0/+1
| | | | | | | | (cherry picked from commit 27049189d6221fefe43eb55846efaa51742dcdf4)
| * mesa: refactor: move multisample-related functions into new multisample.c fileBrian Paul2008-09-211-0/+1
| |
| * mesa: refactor: move glClear, glClearColor into new clear.c file.Brian Paul2008-09-211-0/+1
| |
| * mesa: refactor: move scissor functions into new scissor.c fileBrian Paul2008-09-211-0/+1
| | | | | | | | (cherry picked from commit 4be7296bfcba22a849f949d105ea385e6964cc25)
| * mesa: refactor: move _mesa_init_exec_table() into new api_exec.c fileBrian Paul2008-09-211-0/+1
| | | | | | | | (cherry picked from commit b36e6f0baf64491772b8e1a1cddf68a7dcf8ee22)
| * mesa: refactor: move glReadPixels code into new readpix.c fileBrian Paul2008-09-211-0/+1
| |
| * mesa: refactor: move glPixelStore function into new pixelstore.c fileBrian Paul2008-09-211-0/+1
| |
* | swrast: remove merge droppingsKeith Whitwell2008-09-211-5/+0
| |
* | Merge branch 'master' into gallium-0.2Keith Whitwell2008-09-211-0/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-211-0/+2
| | | | | | | | | | | | Also unify caching of fragment and vertex programs in shader/prog_cache.c` Brought across from gallium-0.2
| * mesa: move rastpos helper to tnlKeith Whitwell2008-09-211-0/+1
| |
| * 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-181-0/+3
| | | | | | | | | | This is another step toward removing a whole bunch of -I flags from the cc commands. Still need to address driver code...
* | mesa: bring sources into line with sources.mak, but omit gallium codeKeith Whitwell2008-09-181-14/+17
|/
* fix Xlib libGL.so build problem.Brian Paul2008-06-091-0/+1
| | | | Also, build driverfuncs.c into libmesa.a since it's always needed.
* more old stuff, rename SOLO->MESA, etcBrian Paul2008-06-091-25/+8
|
* remove X11, Glide, OSMesa sourcesBrian Paul2008-06-051-32/+1
|
* Updated GLSL uniform/sampler handling from gallium-0.1 branchBrian Paul2008-05-141-0/+1
| | | | | | | | | | Previously, the shader linker combined the uniforms used by the vertex and fragment shaders into a combined set of uniforms. This made the implementation of glUniform*() simple, but was rather inefficient otherwise. Now each shader gets its own set of uniforms (no more modelview matrix showing up in the fragment shader uniforms, for example). cherry-picked by hand from gallium-0.1 branch
* Rename occlude.[ch] to queryobj.[ch]Brian2007-04-211-1/+1
|
* added slang_mem.cBrian2007-04-211-0/+1
|
* added new xm_glide.c fileBrian2007-04-201-0/+1
|
* remove t_vb_arbprogram.cBrian2007-04-161-2/+0
|
* move some code into new slang_ir.c fileBrian2007-03-241-0/+1
|
* Overhaul of error handling.Brian2007-02-261-1/+1
|
* added slang_label.cBrian2007-02-231-0/+1
|
* remove nvvertexec.c, add prog_execute.cBrian2007-02-221-1/+1
|
* Merge branch 'origin' into glsl-compiler-1Brian2007-02-221-18/+21
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/state.c src/mesa/shader/program.c src/mesa/shader/program.h src/mesa/shader/programopt.c src/mesa/shader/slang/slang_execute.c src/mesa/sources src/mesa/swrast/s_arbshader.c src/mesa/swrast/s_context.c src/mesa/swrast/s_span.c src/mesa/swrast/s_zoom.c src/mesa/tnl/t_context.c src/mesa/tnl/t_save_api.c src/mesa/tnl/t_vb_arbprogram.c src/mesa/tnl/t_vp_build.c src/mesa/tnl/t_vtx_eval.c
| * Helper for rebasing draw requests where min_index != 0.Keith Whitwell2007-01-301-0/+1
| |
| * remove tnl/t_vtx_x86_gcc.S file from sources as it no longer existsRoland Scheidegger2007-01-251-2/+1
| |
| * Add vbo_split fileskeithw2007-01-151-0/+3
| |
| * better handling of current attributes. Trivial dlist and varray tests workKeith Whitwell2006-10-301-16/+14
| |
* | added slang_builtin.cBrian2007-02-201-0/+1
| |
* | add prog_debug.cBrian2007-02-091-0/+1
| |
* | remove slang_library_texsample.[ch]Brian2007-02-021-1/+0
| |
* | rename slang_link2.c slang_link.cBrian2007-02-021-3/+3
| |
* | rename slang_assemble_typeinfo.[ch] to slang_typeinfo.[ch]Brian2007-02-021-1/+1
| |
* | remove slang_assemble*.c filesBrian2007-02-021-4/+0
| |
* | remove slang_export.c and related codeBrian2007-02-021-1/+0
| |
* | remove slang_link.c and slang_analyse.cBrian2007-02-021-2/+0
| |
* | remove slang_execute.c, slang_execute_x86.cBrian2007-02-021-3/+1
| |
* | remove slang_label.c until it's readyBrian2007-02-011-1/+0
| |
* | fix g++ warnings/errorsBrian2007-01-231-0/+1
| |
* | Rework code related to temp register allocation, both for user variablesBrian2007-01-131-0/+1
| | | | | | | | | | | | and expression temporarires. Much better register utilization now. Lots of other fixes. The OpenGL GLSL "orange book" brick shader demo works now.
* | Overhaul of GLSL API functions, dispatching, etc.Brian2006-12-191-4/+1
| |