summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys
Commit message (Collapse)AuthorAgeFilesLines
* winsys/radeon: add R300 infix to winsys feature namesMarek Olšák2011-07-252-4/+4
|
* winsys/radeon: simplify how value queries workMarek Olšák2011-07-254-128/+101
| | | | | This drops the get_value query and adds a function query_info, which returns all the values in one nice structure.
* r600g: fix corner case checks for the queriesVadim Girlin2011-07-181-5/+3
|
* r600g: Get rid of leftover PB_USAGE_* flags.Henri Verbeet2011-07-183-7/+7
| | | | | | | These happen to work because their values are the same as the equivalent PIPE_TRANSFER_* flags, but it's still misleading. Signed-off-by: Henri Verbeet <[email protected]>
* r600g: print to stderr that a CS has been rejected by the kernelMarek Olšák2011-07-151-0/+4
| | | | Just fixing the warning that r is unused.
* r600g: fix queries and predicationVadim Girlin2011-07-152-38/+95
| | | | | | | Use all zpass data for predication instead of the last block only. Use query buffer as a ring instead of reusing the same area for each new BeginQuery. All query buffer offsets are in bytes to simplify offsets math.
* Merge branch 'pipe-video'Christian König2011-07-1312-0/+2907
|\
| * [g3dvl] remove some unneeded MakefilesChristian König2011-07-134-121/+0
| |
| * r600g: revert "set BLEND_CLAMP depending on clamp_fragment_color"Christian König2011-07-131-10/+8
| | | | | | | | BLEND_CLAMP doesn't seems to be the right way to implement "ARB_color_buffer_float".
| * Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-07-113-15/+31
| |\ | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_pipe.c src/gallium/drivers/r600/r600_state_inlines.h
| * | [g3dvl] stop calling dri2DestroyDrawableChristian König2011-07-091-16/+0
| | | | | | | | | | | | | | | | | | When switching channels with xine it sometimes happens that xine destroys the drawable before we get a chance to call DRI2DestroyDrawable, resulting in an x error.
| * | [g3dvl] and finally remove pipe_video_contextChristian König2011-07-083-29/+4
| | |
| * | [g3dvl] remove the unused priv member from pipe_video_contextChristian König2011-07-082-6/+2
| | |
| * | [g3dvl] remove create_surface from video contextChristian König2011-07-082-4/+4
| | |
| * | [g3dvl] make pipe_context mandatory for creation pipe_video_contextChristian König2011-07-083-7/+30
| | |
| * | Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-07-0414-132/+159
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac src/gallium/drivers/r600/r600_state_inlines.h src/gallium/tests/trivial/Makefile src/gallium/winsys/g3dvl/dri/XF86dri.c src/gallium/winsys/g3dvl/dri/driclient.c src/gallium/winsys/g3dvl/dri/driclient.h src/gallium/winsys/g3dvl/dri/xf86dri.h src/gallium/winsys/g3dvl/dri/xf86dristr.h src/gallium/winsys/r600/drm/r600_bo.c
| * \ \ Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-06-0910-989/+478
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/tests/unit/u_format_test.c src/gallium/winsys/r600/drm/r600_hw_context.c
| * \ \ \ Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-06-055-58/+518
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-05-213-6/+24
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-05-158-893/+998
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into pipe-videoChristian König2011-05-0710-87/+408
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_state.c
| * | | | | | | | r600g: revert commit 68cc6bc5d8b6986acc7f5780d705f4ae9be2a446Christian König2011-04-261-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit "remove the unneeded bo from COLOR[0-9]_INFO Also implement a working alternative.
| * | | | | | | | r600g: remove the unneeded bo from COLOR[0-9]_INFOChristian König2011-04-241-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The COLOR[0-7]_INFO registers doesn't neeed a bo.
| * | | | | | | | Merge remote branch 'origin/master' into pipe-videoChristian König2011-04-2317-553/+1135
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/linux-dri src/gallium/drivers/r600/r600_pipe.c src/gallium/drivers/r600/r600_state.c src/gallium/include/pipe/p_format.h src/gallium/tests/graw/fragment-shader/frag-abs.sh src/gallium/tests/graw/fragment-shader/frag-add.sh src/gallium/tests/graw/fragment-shader/frag-cb-1d.sh src/gallium/tests/graw/fragment-shader/frag-cb-2d.sh src/gallium/tests/graw/fragment-shader/frag-dp3.sh src/gallium/tests/graw/fragment-shader/frag-dp4.sh src/gallium/tests/graw/fragment-shader/frag-dst.sh src/gallium/tests/graw/fragment-shader/frag-ex2.sh src/gallium/tests/graw/fragment-shader/frag-face.sh src/gallium/tests/graw/fragment-shader/frag-flr.sh src/gallium/tests/graw/fragment-shader/frag-frc.sh src/gallium/tests/graw/fragment-shader/frag-kil.sh src/gallium/tests/graw/fragment-shader/frag-lg2.sh src/gallium/tests/graw/fragment-shader/frag-lit.sh src/gallium/tests/graw/fragment-shader/frag-lrp.sh src/gallium/tests/graw/fragment-shader/frag-mad-immx.sh src/gallium/tests/graw/fragment-shader/frag-mad.sh src/gallium/tests/graw/fragment-shader/frag-max.sh src/gallium/tests/graw/fragment-shader/frag-min.sh src/gallium/tests/graw/fragment-shader/frag-mov.sh src/gallium/tests/graw/fragment-shader/frag-mul.sh src/gallium/tests/graw/fragment-shader/frag-rcp.sh src/gallium/tests/graw/fragment-shader/frag-rsq.sh src/gallium/tests/graw/fragment-shader/frag-sge.sh src/gallium/tests/graw/fragment-shader/frag-slt.sh src/gallium/tests/graw/fragment-shader/frag-srcmod-abs.sh src/gallium/tests/graw/fragment-shader/frag-srcmod-absneg.sh src/gallium/tests/graw/fragment-shader/frag-srcmod-neg.sh src/gallium/tests/graw/fragment-shader/frag-srcmod-swz.sh src/gallium/tests/graw/fragment-shader/frag-sub.sh src/gallium/tests/graw/fragment-shader/frag-tempx.sh src/gallium/tests/graw/fragment-shader/frag-xpd.sh src/gallium/tests/graw/vertex-shader/vert-abs.sh src/gallium/tests/graw/vertex-shader/vert-add.sh src/gallium/tests/graw/vertex-shader/vert-arl.sh src/gallium/tests/graw/vertex-shader/vert-arr.sh src/gallium/tests/graw/vertex-shader/vert-cb-1d.sh src/gallium/tests/graw/vertex-shader/vert-cb-2d.sh src/gallium/tests/graw/vertex-shader/vert-dp3.sh src/gallium/tests/graw/vertex-shader/vert-dp4.sh src/gallium/tests/graw/vertex-shader/vert-dst.sh src/gallium/tests/graw/vertex-shader/vert-ex2.sh src/gallium/tests/graw/vertex-shader/vert-flr.sh src/gallium/tests/graw/vertex-shader/vert-frc.sh src/gallium/tests/graw/vertex-shader/vert-lg2.sh src/gallium/tests/graw/vertex-shader/vert-lit.sh src/gallium/tests/graw/vertex-shader/vert-lrp.sh src/gallium/tests/graw/vertex-shader/vert-mad.sh src/gallium/tests/graw/vertex-shader/vert-max.sh src/gallium/tests/graw/vertex-shader/vert-min.sh src/gallium/tests/graw/vertex-shader/vert-mov.sh src/gallium/tests/graw/vertex-shader/vert-mul.sh src/gallium/tests/graw/vertex-shader/vert-rcp.sh src/gallium/tests/graw/vertex-shader/vert-rsq.sh src/gallium/tests/graw/vertex-shader/vert-sge.sh src/gallium/tests/graw/vertex-shader/vert-slt.sh src/gallium/tests/graw/vertex-shader/vert-srcmod-abs.sh src/gallium/tests/graw/vertex-shader/vert-srcmod-absneg.sh src/gallium/tests/graw/vertex-shader/vert-srcmod-neg.sh src/gallium/tests/graw/vertex-shader/vert-srcmod-swz.sh src/gallium/tests/graw/vertex-shader/vert-sub.sh src/gallium/tests/graw/vertex-shader/vert-xpd.sh src/gallium/tools/trace/dump.py src/gallium/tools/trace/format.py src/gallium/tools/trace/model.py src/gallium/tools/trace/parse.py
| * | | | | | | | | [g3dvl] get softpipe to work againChristian König2011-04-101-13/+12
| | | | | | | | | |
| * | | | | | | | | [g3dvl] stop waiting for replay of DRI2CopyRegionChristian König2011-04-071-4/+1
| | | | | | | | | |
| * | | | | | | | | [g3dvl] and finally split the decoder part out of the contextChristian König2011-04-062-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should give a good basis to implement vdpau ontop of it.
| * | | | | | | | | Merge remote branch 'origin/master' into pipe-videoChristian König2011-03-1910-25/+46
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_asm.c src/gallium/tests/unit/SConscript
| * | | | | | | | | | get softpipe winsys to compile againChristian König2011-03-191-6/+9
| | | | | | | | | | |
| * | | | | | | | | | Merge remote branch 'origin/master' into pipe-videoChristian König2011-03-0310-46/+151
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2011-02-286-5/+46
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2011-02-2425-973/+1184
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac src/gallium/auxiliary/Makefile src/gallium/auxiliary/SConscript src/gallium/drivers/r600/r600_asm.c src/gallium/drivers/r600/r600_asm.h src/gallium/drivers/r600/r600_shader.c src/gallium/drivers/r600/r600_state_inlines.h src/gallium/drivers/r600/r600_texture.c
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2011-01-203-41/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_asm.c
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2011-01-201-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_asm.c src/gallium/drivers/r600/r600_shader.c
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2011-01-126-42/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_shader.c
| * | | | | | | | | | | | | | | | r600g: place buffers into different domains, based on usage flagsChristian König2011-01-101-5/+18
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge remote branch 'origin/master' into pipe-videoChristian König2011-01-0813-172/+455
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac src/gallium/drivers/r600/eg_asm.c src/gallium/drivers/r600/r600_asm.c src/gallium/drivers/r600/r600_asm.h src/gallium/include/pipe/p_format.h src/gallium/targets/dri-nouveau/Makefile
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2010-12-228-286/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2010-12-1132-1061/+989
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r600/r600_pipe.c src/gallium/drivers/r600/r600_texture.c
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2010-11-218-33/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/Makefile src/gallium/auxiliary/SConscript
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into pipe-videoChristian König2010-11-119-101/+162
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-videoChristian König2010-10-288-158/+300
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/include/pipe/p_format.h
| * | | | | | | | | | | | | | | | | | | | | | Some more merge fixesChristian König2010-10-231-16/+2
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fix problems created by MergeChristian König2010-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-videoChristian König2010-10-1267-905/+7949
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac src/gallium/drivers/nvfx/Makefile src/gallium/include/pipe/p_defines.h src/gallium/include/pipe/p_screen.h src/gallium/include/state_tracker/dri1_api.h src/gallium/include/state_tracker/drm_api.h src/gallium/winsys/nouveau/drm/nouveau_drm_api.c
| * | | | | | | | | | | | | | | | | | | | | | | vl: Drop DRI1, clean up DRI2 bits.Younes Manton2010-06-065-369/+218
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | vl: Get nouveau building again.Younes Manton2010-05-291-24/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still some DRI2 bits to sort out.
| * | | | | | | | | | | | | | | | | | | | | | | vl: Use pipe_screen::video_context_create hook instead of SP ctor.Younes Manton2010-05-241-1/+5
| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | vl: Get softpipe working again.Younes Manton2010-05-232-23/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still segfaults on softpipe->destroy() in the draw module when freeing a vertex buffer.
| * | | | | | | | | | | | | | | | | | | | | | | vl: Get softpipe building again.Younes Manton2010-05-082-235/+27
| | | | | | | | | | | | | | | | | | | | | | | |