aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into ↵Alan Hourihane2008-09-1185-2049/+1605
|\ | | | | | | | | | | | | | | | | | | | | gallium-0.2 Conflicts: src/mesa/drivers/dri/i915/intel_ioctl.c src/mesa/main/texstore.c src/mesa/tnl/t_vp_build.c src/mesa/vbo/vbo_exec_draw.c
| * added 24bpp supportShane Blackett2008-09-111-10/+217
| |
| * Fixes for MingwShane Blackett2008-09-112-2/+2
| |
| * intel: track move of bo_exec from drivers to bufmgr.Eric Anholt2008-09-1026-218/+10
| |
| * intel: track bufmgr move to libdrm_intel and bufmgr_fake irq emit/wait change.Eric Anholt2008-09-1026-196/+96
| |
| * intel: Move the bufmgr back to the screen.Eric Anholt2008-09-106-114/+132
| | | | | | | | | | | | | | Mesa requires that we be able to share objects between contexts, which means that the objects need to be created by the same bufmgr, and the bufmgr internally requires pthread protection for thread safety. Rely on the bufmgr having appropriate locking.
| * mesa: replace MALLOC w/ CALLOC to fix memory error in glPushClientAttrib()Brian Paul2008-09-051-1/+1
| |
| * mesa: replace MALLOC w/ CALLOC to fix valgrind warningBrian Paul2008-09-051-1/+1
| |
| * intel: only enable occlusion query if the drm has defines.Dave Airlie2008-09-051-0/+8
| | | | | | | | | | This interface has to be re-written to not be dumb and to work for multiple apps.
| * mesa: improved gl_buffer_object reference countingBrian Paul2008-09-0410-186/+241
| | | | | | | | | | Use new _mesa_reference_buffer_object() function wherever possible. Fixes buffer object/display list crash reported in ParaView.
| * configure.ac: bump dri2proto requirement, drop TTM_API define.Kristian Høgsberg2008-09-041-20/+1
| |
| * intel: Fix depth_stencil texture.Xiang, Haihao2008-09-043-3/+3
| |
| * mesa: merge stencil values into depth values for MESA_FORMAT_S8_Z24Xiang, Haihao2008-09-041-2/+2
| |
| * mesa: Support for MESA_FORMAT_S8_Z24 textureJakob Bornecrantz2008-09-045-0/+134
| | | | | | | | cherry-picked from gallium-0.1
| * intel: Fix prototype warning.Eric Anholt2008-09-031-0/+2
| |
| * intel: Fix refcounting on depth buffer initialization in DRI2.Eric Anholt2008-09-032-16/+4
| | | | | | | | (Reverts a change to work around the problem on 965).
| * intel: Fix a crash if dri2 is disabled.Xiang, Haihao2008-09-031-8/+8
| |
| * fix BUFFER_DEPTH/BUFFER_ACCUM mix-upBrian Paul2008-09-021-6/+6
| |
| * fix no error generated when calling glLight{if}[v] inside begin/end (bug 17408)Roland Scheidegger2008-09-021-0/+1
| |
| * Fix build by removing #include of removed dri_sarea.h.Michel Dänzer2008-09-011-1/+0
| | | | | | | | Thanks to JohnFlux on IRC for pointing out the problem.
| * DRI2: Drop sarea, implement swap buffers in the X server.Kristian Høgsberg2008-08-2919-639/+446
| |
| * i965: force thread switch after IF/ELSE/ENDIF. partial fix for #16882.Xiang, Haihao2008-08-291-0/+5
| | | | | | | | | | | | A thread switch is implicitly invoked after the issuance of an IF/ELSE/ENDIF instruction if necessary. Unfortunately it seems sometimes a forced thread switch is needed.
| * i965: mask control for BREAK/CONT/DO/WHILE. partial fix fox #16882Xiang, Haihao2008-08-291-4/+4
| |
| * i965: Push/pop instruction state. partial fix for #16882Xiang, Haihao2008-08-291-2/+2
| |
| * mesa: bump MAX_INSN to 350Brian Paul2008-08-281-1/+1
| |
| * mesa: don't check for GLSL 1.2 to advertise GL 2.1Brian Paul2008-08-262-11/+7
| | | | | | | | The GLSL 1.2 features are minor...
| * added 7.1 MD5 sumsBrian Paul2008-08-261-1/+9
| |
| * change MESA_MINOR to 3Brian Paul2008-08-261-1/+1
| |
| * 7.1 updates from 7.2 branchBrian Paul2008-08-263-2/+25
| |
| * asst. html doc updatesTimo Jyrinki2008-08-263-8/+13
| |
* | mesa: fix srcRowStride vs srcRowBytes conflictKeith Whitwell2008-09-111-45/+45
| |
* | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-111908-29195/+207511
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * draw: attempt atomic submit of large drawelements callsKeith Whitwell2008-08-266-26/+29
| |
| * vbo: seed initial max_element value with a more likely candidateKeith Whitwell2008-08-261-6/+6
| |
| * cell: asst fixes to get driver building/running again.Brian2008-08-2518-39/+176
| | | | | | | | Note that SPU vertex transformation is disabled at this time.
| * gallium: added const qualifiers on some draw funcsBrian2008-08-252-4/+4
| |
| * gallium: include p_debug.h for non-HAVE_POSIX_MEMALIGNBrian2008-08-251-0/+1
| |
| * gallium: include <sched.h> on linux to get sched_yield() protoBrian2008-08-251-0/+1
| |
| * gallium: include u_math.hBrian Paul2008-08-251-1/+2
| |
| * gallium: Add missing includes.Michal Krol2008-08-252-1/+2
| |
| * gallium: include u_memory.h, u_math.hBrian2008-08-242-0/+2
| |
| * gallium: remove old tile util filesBrian Paul2008-08-242-1269/+0
| |
| * gallium: refactor/replace p_util.h with util/u_memory.h and util/u_math.hBrian Paul2008-08-24200-478/+2245
| | | | | | | | Also, rename p_tile.[ch] to u_tile.[ch]
| * trace: Include u_string.h.Michal Krol2008-08-231-0/+1
| |
| * util: Silence compiler warnings on Windows.Michal Krol2008-08-231-1/+1
| |
| * util: Include missing u_rect.h.Michal Krol2008-08-231-1/+1
| |
| * gallium: rename p_util.c to u_rect.c (it only contains rect copy/fill helpers)Brian Paul2008-08-223-3/+3
| |
| * gallium: move pipe_copy_rect(), pipe_fill_rect() protos into new u_rect.h headerBrian Paul2008-08-228-13/+60
| |
| * gallium: replace align_int() with align()Brian Paul2008-08-224-19/+14
| | | | | | | | The two functions are identical. Removed align_int() from p_util.h
| * gallium: insert __cplusplus/extern wrappingsBrian Paul2008-08-221-0/+9
| |