summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys
Commit message (Collapse)AuthorAgeFilesLines
* Revert "r300g: flush CS if a buffer being deleted is referenced by it"Corbin Simpson2009-12-183-8/+0
| | | | | | | | | | | As requested by just about everybody. I'm going back to actually reading patches before ACKing and pushing them. This reverts commit 417ce06306962a9355cbb35cefcdea1951b0ce85. Conflicts: src/gallium/winsys/drm/radeon/core/radeon_buffer.c
* Merge branch 'pipe-format-simplify'Michal Krol2009-12-189-25/+34
|\
| * Move the remaining format pf_get_* functions to u_format.h.Michal Krol2009-12-179-25/+26
| | | | | | | | | | Previously they depended on format blocks, but after removing those they started depending on format encoding.
| * Merge branch 'master' into pipe-format-simplifyMichal Krol2009-12-1729-210/+1749
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_pipe_aaline.c src/gallium/auxiliary/draw/draw_pipe_pstipple.c src/gallium/auxiliary/util/u_blit.c src/gallium/auxiliary/util/u_gen_mipmap.c src/gallium/auxiliary/util/u_surface.c src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c src/gallium/drivers/cell/ppu/cell_texture.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/r300/r300_emit.c src/gallium/drivers/r300/r300_texture.c src/gallium/drivers/softpipe/sp_texture.c src/gallium/drivers/softpipe/sp_tile_cache.c src/gallium/drivers/svga/svga_state_vs.c src/gallium/include/pipe/p_format.h src/gallium/state_trackers/dri/dri_drawable.c src/gallium/state_trackers/egl/egl_surface.c src/gallium/state_trackers/python/p_device.i src/gallium/state_trackers/python/st_softpipe_winsys.c src/gallium/state_trackers/vega/api_filters.c src/gallium/state_trackers/vega/image.c src/gallium/state_trackers/vega/mask.c src/gallium/state_trackers/vega/paint.c src/gallium/state_trackers/vega/renderer.c src/gallium/state_trackers/vega/vg_tracker.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/state_trackers/xorg/xorg_exa.c src/gallium/state_trackers/xorg/xorg_renderer.c src/gallium/state_trackers/xorg/xorg_xv.c src/gallium/state_trackers/xorg/xvmc/surface.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_buffer.c src/gallium/winsys/egl_xlib/sw_winsys.c src/gallium/winsys/g3dvl/xlib/xsp_winsys.c src/gallium/winsys/gdi/gdi_llvmpipe_winsys.c src/gallium/winsys/gdi/gdi_softpipe_winsys.c src/gallium/winsys/xlib/xlib_cell.c src/gallium/winsys/xlib/xlib_llvmpipe.c src/gallium/winsys/xlib/xlib_softpipe.c src/mesa/state_tracker/st_cb_fbo.c src/mesa/state_tracker/st_cb_texture.c src/mesa/state_tracker/st_texture.c
| * | Move pf_get_bits/size() to u_format auxiliary module.Michal Krol2009-12-032-4/+5
| | |
| * | Move pf_get_block() to u_format auxiliary module.Michal Krol2009-12-038-9/+18
| | |
* | | r300g: store own copy of flush_cb and flush data.Dave Airlie2009-12-183-2/+8
| |/ |/| | | | | don't go sneaking around inside the libdrm copy.
* | Merge branch 'glsl-pp-rework-2'Michal Krol2009-12-171-1/+1
|\ \
| * \ Merge branch 'master' into glsl-pp-rework-2Michal Krol2009-12-1277-1978/+6215
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/perf/drawoverhead.c progs/perf/teximage.c progs/perf/vbo.c progs/perf/vertexrate.c src/mesa/shader/slang/library/slang_common_builtin_gc.h
| * | | scons: Get GLSL code building correctly when cross compiling.José Fonseca2009-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | This is quite messy. GLSL code has to be built twice: one for the host OS, another for the target OS.
| * | | gdi: Link to glslcl.Michal Krol2009-11-131-1/+1
| | | |
| * | | Merge commit 'origin/master' into glsl-pp-rework-2Michal Krol2009-09-175-28/+321
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/winsys/gdi/SConscript
| * \ \ \ Merge commit 'origin/master' into glsl-pp-rework-2Michal Krol2009-09-143-4/+34
| |\ \ \ \
| * | | | | gdi: Fix prototype of gdi_softpipe_surface_buffer_create().Michal Krol2009-09-081-0/+1
| | | | | |
| * | | | | gdi: Add glsl to LIBS.Michal Krol2009-09-071-1/+1
| | | | | |
* | | | | | r300g: flush CS if a buffer being deleted is referenced by itMarek Olšák2009-12-153-0/+8
| |_|_|/ / |/| | | |
* | | | | Merge branch 'mesa_7_7_branch'Brian Paul2009-12-115-3/+100
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/state_trackers/xorg/xorg_xv.c src/mesa/drivers/dri/intel/intel_span.c
| * | | | | vmware/xorg: Properly detect overlay supportJakob Bornecrantz2009-12-093-0/+38
| | | | | |
| * | | | | vmware/core: Update vmwgfx_drm.hJakob Bornecrantz2009-12-091-2/+4
| | | | | |
| * | | | | vmware/xorg: Also stop ports on closeJakob Bornecrantz2009-12-041-1/+2
| | | | | |
| * | | | | vmware/xorg: Stop video ports on leave vtJakob Bornecrantz2009-12-043-0/+56
| | | | | |
* | | | | | winsys/intel: fix dereferencing of opaque type due to pipe_reference changesRoland Scheidegger2009-12-101-1/+1
| | | | | |
* | | | | | Merge branch 'gallium-strict-aliasing'Roland Scheidegger2009-12-082-2/+3
|\ \ \ \ \ \
| * | | | | | gallium: fix remaining users of pipe_reference functionRoland Scheidegger2009-12-032-2/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'mesa_7_7_branch'Michel Dänzer2009-12-083-1/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | vmware/xorg: Fix SCons build.Michel Dänzer2009-12-082-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Not sure how vmw_screen.c could build at all though...
| * | | | | vmware/xorg: Avoid warning about HAVE_STDINT_H being redefined.Michel Dänzer2009-12-081-1/+3
| | | | | |
* | | | | | Merge branch 'mesa_7_7_branch'Andre Maasikas2009-12-085-4/+109
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/r600/r700_assembler.c src/mesa/main/version.h
| * | | | | vmware/xorg: Use Write instead of WriteRead for cursor bypassJakob Bornecrantz2009-12-041-2/+2
| | | | | |
| * | | | | vmware/xorg: Give kernel infromation about cursor bypassJakob Bornecrantz2009-12-043-4/+75
| | | | | |
| * | | | | vmware/xorg: Handle no init of video in vmw_video_closeJakob Bornecrantz2009-12-041-0/+2
| | | | | |
| * | | | | vmware/core: Update vmwgfx_drm.h to include cursor bypassJakob Bornecrantz2009-12-041-0/+32
| | | | | |
* | | | | | radeong: Automatically softpipe for non-r3xx.Corbin Simpson2009-12-061-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Well, technically non-r[345]xx. At any rate... $ glxgears libGL: OpenDriver: trying /home/simpson/mesa/lib/gallium/r600_dri.so 131 frames in 5.0 seconds = 26.107 FPS I'm sure you can see where this is going. :3
* | | | | | radeong: Call softpipe_create directly.Corbin Simpson2009-12-066-90/+4
| | | | | | | | | | | | | | | | | | | | | | | | Allows us to finally remove radeon_winsys_softpipe.
* | | | | | radeong: flush CS if a buffer being mapped is referenced by itMarek Olšák2009-12-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Also, overlapping occlusion queries seems to work now.
* | | | | | r300g, radeong: fix the CS overflowMarek Olšák2009-12-041-2/+3
| | | | | |
* | | | | | r300g: fix warningsMarek Olšák2009-12-041-0/+2
| | | | | |
* | | | | | Merge branch 'gallium-noblocks'Roland Scheidegger2009-12-049-102/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/state_trackers/xorg/xorg_exa.c
| * | | | | | fixups for interface changes (mostly state trackers)Roland Scheidegger2009-11-309-102/+36
| | | | | | |
* | | | | | | Merge branch 'mesa_7_7_branch'Jakob Bornecrantz2009-12-029-5/+1470
|\ \ \ \ \ \ \ | | |/ / / / / | |/| / / / / | |_|/ / / / |/| | | | |
| * | | | | Merge commit 'mesa_7_6_branch' into mesa_7_7_branchJakob Bornecrantz2009-12-021-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/version.h
| | * | | | | cell: added tex_usage param to xm_surface_buffer_create()Brian Paul2009-12-021-0/+1
| | | | | | |
| * | | | | | vmware/xorg: Add video supportJakob Bornecrantz2009-12-015-0/+1199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using the hooks st/xorg provides us we can create a driver specific implementation that uses the svga overlay engines.
| * | | | | | vmware/xorg: Create a small driver that sits ontop of st/xorgJakob Bornecrantz2009-12-015-4/+205
| | | | | | |
| * | | | | | vmware/core: Update vmwgfx_drm.h to latest versionJakob Bornecrantz2009-12-011-1/+65
| | | | | | |
* | | | | | | radeong: Clean up some bad code.Corbin Simpson2009-12-021-8/+2
| | | | | | |
* | | | | | | radeong: Add helper to determine pipe driver.Corbin Simpson2009-12-021-0/+8
| | | | | | |
* | | | | | | radeong: Do ioctls before selecting pipe driver.Corbin Simpson2009-12-022-66/+65
| | | | | | |
* | | | | | | r300g, radeong: De-specialize r300_winsys into radeon_winsys.Corbin Simpson2009-12-025-101/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There's like five good reasons for this, I swear.
* | | | | | | radeong: Change ioctl order, document it.Corbin Simpson2009-12-021-12/+22
| | | | | | |