summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into gallium-0.2Keith Whitwell2008-09-1810-76/+61
|\ | | | | | | | | | | | | Conflicts: progs/trivial/Makefile src/mesa/glapi/glthread.c
| * intel: Destroy bufmgr in screen destroy, not context.Eric Anholt2008-09-162-2/+1
| | | | | | | | | | | | | | Caused server crashes on second context creation since 7e0bbdcf033981282978554c2e68ce48b55aa291. Bug #17600.
| * tdfx: fix crash and lack of visuals bugJakub Bogusz2008-09-131-52/+25
| |
| * i915: fix himask constant init for 64-bit buildGuillaume Melquiond2008-09-131-1/+1
| |
| * intel: Add a width field to regions, and use it for making miptrees in TFP.Eric Anholt2008-09-126-15/+25
| | | | | | | | | | Otherwise, we would use the pitch as width of the texture, and compiz would render the pitch padding on the right hand side.
| * intel: Don't segfault on TFP from a bad drawable.Eric Anholt2008-09-122-0/+9
| |
| * intel: Remove dead allow_batchbuffer param.Eric Anholt2008-09-122-6/+0
| |
| * i965: Add support for G41 chipset which is another 4 series.Xiang, Haihao2008-09-122-1/+6
| |
* | i965: Add support for G41 chipset which is another 4 series.Xiang, Haihao2008-09-182-1/+6
| |
* | i915simple: A step closer to compilingJakob Bornecrantz2008-09-121-70/+1
| |
* | Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into ↵Alan Hourihane2008-09-1151-1533/+628
|\| | | | | | | | | | | | | | | | | | | | | 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
| |
| * 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.
| * 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.
| * intel: Fix depth_stencil texture.Xiang, Haihao2008-09-043-3/+3
| |
| * 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 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-2911-378/+212
| |
| * 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
| |
* | Merge branch 'gallium-0.1' into gallium-0.2Keith Whitwell2008-09-11310-817/+5995
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * util: Eliminate pipe from the arguments to pipe_get/put_tile_xxx functions.José Fonseca2008-07-131-2/+2
| | | | | | | | | | You don't need a pipe_context * for this, and all other necessary info is already inside pipe_surface.
| * mesa: disable fprintf() errorBrian Paul2008-07-091-0/+2
| |
| * mesa: Replace Proxy1D/2D/etc with ProxyTex[] indexed by TEXTURE_x_INDEX.Brian Paul2008-07-041-1/+1
| | | | | | | | | | | | Simplification in colortab.c too. cherry-picked from master (fe469007037d9d5cdbe1677d8ff7368b276e9e7c)
| * mesa: fix issues around multisample enableRoland Scheidegger2008-07-021-1/+1
| | | | | | | | | | multisample enable is enabled by default, however gl mandates multisample rendering rules only apply if there's also a multisampled buffer.
| * gallium: handle msaaRoland Scheidegger2008-06-272-46/+54
| |
| * mesa/dri: User standard integer types.José Fonseca2008-06-2456-347/+347
| |
| * revert the DRI2 commitsAlan Hourihane2008-06-129-1050/+860
| |
| * Bring in DRI2 changesAlan Hourihane2008-06-119-860/+1050
| |
| * mesa: Xlib libGL.so fixes from masterBrian Paul2008-06-091-3/+1
| |
| * Makefile clean-upsBrian Paul2008-06-092-3/+3
| |
| * mesa: sync up with latest Makefile changes on masterBrian Paul2008-06-063-8/+52
| |
| * sync up with Makefile changes on masterBrian Paul2008-06-052-2/+117
| |
| * Move construction of libOSMesa.so into src/mesa/drivers/osmesa/MakefileBrian Paul2008-06-051-0/+74
| | | | | | | | | | This removes some cruft from src/mesa/Makefile. Something similar could be done for stand-alone / Xlib-Mesa libGL...
| * insert mesa/ before include filesBrian Paul2008-06-051-7/+7
| | | | | | | | (picked from master)
| * Remove CVS keywords.José Fonseca2008-05-26268-274/+51
| |
| * Regenerated API dispatch filesBrian Paul2008-05-181-36/+12
| | | | | | | | Follow on to cherry-pick from master
| * Alias glStencilOpSeparateATI with glStencilOpSeparate.Brian2008-04-041-9/+3
| |
| * Finish up ATI_separate_stencilBrian2008-04-041-0/+22
| | | | | | | | | | | | Add entrypoints to glapi XML file and regenerate files. Implement glStencilOpSeparateATI(). Consolidate some code in stencil.c
| * gallium: Eliminate p_winsys::printfJosé Fonseca2008-03-311-10/+0
| | | | | | | | Not convenient and almost not used at all. Better replacements in p_debug.h
| * Convert crlf->lf line endings.José Fonseca2008-02-2819-7025/+7025
| | | | | | | | Windows/DOS users should enable core.autocrlf from now on.
| * mesa: Add copyright headers.José Fonseca2008-02-272-23/+45
| |
| * Remove files of unsupported build systems.José Fonseca2008-02-253-130/+0
| |
| * Update scons build for new code layout.José Fonseca2008-02-181-48/+0
| |
| * Code reorganization: update build.José Fonseca2008-02-155-9/+9
| | | | | | | | | | | | | | | | | | Update the Makefiles and includes for the new paths. Note that there hasn't been no separation of the Makefiles yet, and make is jumping all over the place. That will be taken care shortly. But for now, make should work. It was tested with linux and linux-dri. Linux-cell and linux-llvm might require some minor tweaks.