summaryrefslogtreecommitdiff
path: root/src/gallium/state_trackers/xorg
AgeCommit message (Collapse)Author
2010-04-09st/xorg: Fix bad paramf.Corbin Simpson
Should be an integer param, according to docs.
2010-03-30gallium: adapt all code to the renamed depth/stencil formatsRoland Scheidegger
2010-03-16st/xorg: fix up xorg state tracker to use cso changesRoland Scheidegger
use cso_set_fragment_sampler_views instead of cso_set_sampler_textures
2010-03-12st/xorg: Remove flushes no longer necessary thanks to context transfers.Michel Dänzer
2010-03-12st/xorg: context transfersKeith Whitwell
2010-03-11Merge remote branch 'origin/7.8'Michel Dänzer
2010-03-11st/xorg: Include cursorstr.hJakob Bornecrantz
2010-03-10Merge branch '7.8'Michel Dänzer
2010-03-10st/xorg: Work around cursor reference counting bugs in older X servers.Michel Dänzer
Could result in use of freed memory and consequently random crashes, e.g. on screen resize. (cherry picked from commit 21c91b410a2a2cbf8eb677e59e3322f86320f2b0) Conflicts: src/gallium/state_trackers/xorg/xorg_tracker.h
2010-03-09Merge branch 'gallium-vertexelementcso'Roland Scheidegger
Conflicts: src/gallium/auxiliary/cso_cache/cso_context.c src/gallium/auxiliary/util/u_blit.c src/gallium/auxiliary/util/u_gen_mipmap.c src/gallium/drivers/i915/i915_context.h src/gallium/drivers/i965/brw_draw_upload.c src/gallium/drivers/r300/r300_blit.c src/gallium/drivers/r300/r300_context.h src/gallium/drivers/r300/r300_render.c src/gallium/drivers/r300/r300_state_derived.c src/mesa/state_tracker/st_cb_bitmap.c src/mesa/state_tracker/st_cb_clear.c
2010-03-08Merge commit 'origin/gallium-winsys-handle-rebased'Keith Whitwell
2010-03-01xorg: Rename pipe formats.José Fonseca
2010-03-01xorg: adapt to new vertex element csoRoland Scheidegger
2010-03-01gallium: Reorg texture usage flagsJakob Bornecrantz
Introduce a new shared usage and rename primary to scanout. The display target usage is more of a windows concept and doesn't mean the same thing as shared. Display target means that the surface should be presentable, for softpipe this means that it should be backed by a hardware buffer.
2010-03-01gallium: Expose a opaque winsys handle and functions on pipe_screenJakob Bornecrantz
Instead of having these functions on a side interface like on drm_api create a opaque winsys_handle that is to be passed down into the winsys. Currently the only thing ported to this new interface is drm_api, and of that only the components that builds by default is ported. All the drivers and any extra state trackers needs to be ported before this can go into master.
2010-02-27st/xorg: Re-enable crtc on resizeJakob Bornecrantz
2010-02-27st/xorg: Fix copy-topyJakob Bornecrantz
2010-02-27st/xorg: Make resize fail gracefullyJakob Bornecrantz
2010-02-27st/xorg: Obey max {width|height} from kernel and GalliumJakob Bornecrantz
2010-02-27st/xorg: Encapsulate all customizable stuff in a separate class.Thomas Hellstrom
This avoids exposing the ms driver structure to the winsys, and nicely encapsulates driver customizable stuff. In the future more things might be customizable by the winsys, like throttling, 3D readback etc. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-02-27st/xorg: A bit more debugging infoJakob Bornecrantz
2010-02-27st/xorg: Make default of debugging fallbacks smartJakob Bornecrantz
Set it to the same as 2d acceleration
2010-02-27st/xorg, vmware/xorg: Fix xnfcalloc arguments.Thomas Hellstrom
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-02-14xorg: Use util_format_name().José Fonseca
2010-02-12st/dri, st/xorg: fix buffers that have attachements of different depthZack Rusin
we actually need to specify the formats for different attachements, otherwise if the color buffer is 24bpp and the app asks for 16bpp depth buffer than we end up fetching the depth from the drawable which is 24bpp and end up creating the wrong depth buffer. use the new getBuffersWithFormat extension to pass the depth correctly.
2010-02-10st/xorg: fix a silly offset bug in xvZack Rusin
we were multiplying the difference in the wrong direction.
2010-02-08gallium: squash-merge of gallium screen contextKeith Whitwell
Squashed commit of the following: commit 009598122adf5cad42bf9af067eccaf8e89e1233 Author: Christoph Bumiller <e0425955@student.tuwien.ac.at> Date: Mon Feb 8 11:03:26 2010 +0000 nouveau: fix gallium-screen-context branch fallout commit 7b2ffc2019d72e833afea7eebf3e80121187375d Merge: 51e190e c036d13 Author: Keith Whitwell <keithw@vmware.com> Date: Fri Feb 5 09:55:02 2010 +0000 Merge commit 'origin/master' into gallium-screen-context Conflicts: src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c This branch has got a pretty tortured history now, I expect a squash merge will be appropriate when it is done. commit 51e190e95acf120f72768fafb29e9721e358df1b Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 17:58:02 2010 +0000 gallium: fix some build issues commit f524bdaa723fb181637ad30c6ad708aeedabe25b Merge: f906212 3aba0a2 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 17:51:32 2010 +0000 Merge commit 'origin/master' into gallium-screen-context commit f9062126883199eabf045714c717cd35f4b7b313 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 17:17:12 2010 +0000 gallium/docs: small description of screen::create_context commit efcb37bd3d5ed37f06c6105bd2d750b374ec0927 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:42:42 2010 +0000 drm/radeon: more dead create_context wrapper removal commit 6badc0dd9e06cf2ec936940bcf12b9ef5324b301 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:42:30 2010 +0000 drm/i965: more dead create_context wrapper removal commit cf04ebd5a54b18b2d894cfdab2b0f2fd55626ffc Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:42:05 2010 +0000 st/python: more dead create_context wrapper removal commit 444f114c3516abf71c430e6e9d0d2ae3b80679d3 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:37:58 2010 +0000 idenity: wrapped context creation commit 5a6d09cb9e468d1ee6c8d54b887618819d8d94f2 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:28:47 2010 +0000 ws/gdi: remove dead context_create wrapper commit 132b55f4bec39386ac625f09aaa11f609664024c Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:27:52 2010 +0000 ws/gdi: remove dead context_create wrapper commit 56d2d21a0cdcb197a364049d354c2f15a4fc026a Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:25:38 2010 +0000 st/xorg: use screen::context_create commit 838c5cfe56b2af6c644909bed3c5e7cdd64c336a Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:23:20 2010 +0000 glx/xlib: simplify creation of trace-wrapped contexts Trace screen knows how to properly wrap context creation in the wrapped screen, so nothing special to do here. commit c99404c03ebaec4175f08a2f363e43c9085f2635 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:18:24 2010 +0000 st/python: no need to special case context creation for trace commit 193a527a682b6877bb1faecd8092df4dfd055a18 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:15:30 2010 +0000 drm/radeon: remove dead create_context declaration commit bb984eecc25cf23bc77e1c818b81165ba1a07c9a Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:14:58 2010 +0000 nv/drm: remove dead create_context ref commit e809313a44287dc4e16c28e9e74ef3b2b5271aa1 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:12:51 2010 +0000 st/egl: remove a layer of wrappers around screen::create_context commit 39caa6672a04122f185c22e17aab86d1c40938bf Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:05:28 2010 +0000 r300g: fill in screen::context_create commit 407f12556d16ba0656774d8a1d9ebda22f82f473 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 16:04:04 2010 +0000 cell: adapt for screen::create_context, untested commit d02b0c6ce321a04c76fdabb09e0e4380ce1c1376 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:50:24 2010 +0000 drm/nv: adapt for screen::create_context All contexts now created directly through the screen, so remove equivalent code here. Remove apparently un-needed array of contexts in the winsys. commit 53eec5b1349aa1b6892a75a7bff7e7530957aeae Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:50:08 2010 +0000 stw: adapt for screen::create_context, untested commit c6a64de3eb381bc9a88e9fbdecbf87d77925aaf5 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:49:20 2010 +0000 trace: expose the wrapped context's priv data If we are going to keep this priv idea, really want an accessor function for it so that trace and other drivers can wrap that. commit 75d6104e11d86ec2b0749627ed58e35f856ee6eb Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:47:55 2010 +0000 nv30: adapt to screen::context_create commit 12f5deb6ed9723e9b5d34577052b8365813ca14e Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:44:47 2010 +0000 nv40: adapt to screen::context_create commit 14baccaa3b6bbb3b91056126f6521828e786dc62 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:35:27 2010 +0000 nv50: adapt to screen::create_context Not build tested. Need to figure out how to build nouveau. commit a0e94505ccd2d7f3e604465a2ac302f1286b73b6 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:22:27 2010 +0000 llvmpipe: update for screen::create_context, untested commit 0eae17107c950346030e4f7e0ec232f868d3893d Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 15:16:57 2010 +0000 xlib/llvmpipe: remove dead winsys context creation path commit 2f69f9ffaa7e2a01d2483277246ed13051ae4ca3 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 14:58:27 2010 +0000 gallium: convert most code to use screen::create_context I wish I could build all of gallium at once to find breakages. commit d7b57f4061b82322cbcae176125913d9f0dea6c1 Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 12:46:21 2010 +0000 glx: permit building with older protocol headers I'd like to be able to build mesa on current distro releases without having to upgrade from the standard dri2proto and glproto headers. With this change I'm able to build on ancient releases such as Ubuntu 9-10... In general, it would be nice to be able to build-test mesa to check for unintended breakages without having to follow the external dependencies of every group working on the codebase. commit 57adedd6fb06c98572ed8d4aef19203df4c4eea2 Merge: da71847 e1906ae Author: Keith Whitwell <keithw@vmware.com> Date: Thu Feb 4 11:38:15 2010 +0000 Merge commit 'origin/master' into gallium-screen-context Conflicts: src/gallium/drivers/softpipe/sp_video_context.h src/gallium/drivers/trace/tr_context.c src/gallium/state_trackers/wgl/shared/stw_context.c src/gallium/winsys/gdi/gdi_softpipe_winsys.c commit da71847ea6414d7e352c6094f8963bb4eda344dc Author: José Fonseca <jfonseca@vmware.com> Date: Sat May 2 08:57:39 2009 +0100 wgl: Use pipe_screen::context_create. commit 2595a188f93fd903600ef5d8517737ee0592035d Author: José Fonseca <jfonseca@vmware.com> Date: Sat May 2 08:56:47 2009 +0100 trace: Implement pipe_screen::context_create. commit f3640e4ae37a5260cbfba999d079f827de0a313a Author: José Fonseca <jfonseca@vmware.com> Date: Sat May 2 08:56:17 2009 +0100 softpipe: Implement pipe_screen::context_create. commit 347266bddc8bd39c711bacb2193793759d0f3696 Author: José Fonseca <jfonseca@vmware.com> Date: Sat May 2 08:55:31 2009 +0100 gallium: New pipe_screen::context_create callback.
2010-02-04gallium: fix more missing includes from various placesDave Airlie
nouveau/ dri st / vmware
2010-02-02gallium: pipe/p_inlines.h -> util/u_inlines.hJosé Fonseca
2010-01-28st/xorg: Update to new libkms interface but be backwards compatibleJakob Bornecrantz
2010-01-28Merge commit 'origin/perrtblend'Roland Scheidegger
Conflicts: src/gallium/drivers/softpipe/sp_screen.c src/gallium/include/pipe/p_defines.h
2010-01-28st/xorg: Remove unnecessary headers.Vinson Lee
2010-01-25Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: src/mesa/drivers/dri/intel/intel_screen.c src/mesa/drivers/dri/intel/intel_swapbuffers.c src/mesa/drivers/dri/r300/r300_emit.c src/mesa/drivers/dri/r300/r300_ioctl.c src/mesa/drivers/dri/r300/r300_tex.c src/mesa/drivers/dri/r300/r300_texstate.c
2010-01-25st/xorg: Fix crash on resize with libkmsJakob Bornecrantz
2010-01-25xorg: do not enable unnecessary blending for xvRoland Scheidegger
2010-01-25xorg: adapt to blend changesRoland Scheidegger
2010-01-25st/xorg: Improve options and print them to logJakob Bornecrantz
Set 2D acceleration to off by default Get fallback debugging from the Xorg config Also print if 3D acceleration is enabled
2010-01-25st/xorg: Export helper function for detecting modesettingJakob Bornecrantz
2010-01-25st/xorg: Fix warningJakob Bornecrantz
2010-01-22Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: src/gallium/auxiliary/draw/draw_context.c src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c src/gallium/auxiliary/pipebuffer/Makefile src/gallium/auxiliary/pipebuffer/SConscript src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/tgsi/tgsi_scan.c src/gallium/drivers/i915/i915_surface.c src/gallium/drivers/i915/i915_texture.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/softpipe/sp_prim_vbuf.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/winsys/drm/intel/gem/intel_drm_api.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_drm.c src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c src/mesa/state_tracker/st_cb_clear.c
2010-01-21st/xorg: Remove unnecessary headers.Vinson Lee
2010-01-20st/xorg: Fic bug and close drm_api at proper placeJakob Bornecrantz
2010-01-19st/xorg: Don't leak BusID bufferJakob Bornecrantz
2010-01-19st/xorg: Pass kernel driver name to drmOpenJakob Bornecrantz
2010-01-15Merge branch 'gallium-noconstbuf'Roland Scheidegger
Conflicts: src/gallium/drivers/softpipe/sp_draw_arrays.c src/mesa/state_tracker/st_draw_feedback.c
2010-01-15st/xorg: If dri2 version is 2 support version 1 as wellJakob Bornecrantz
Thanks to X server commit 2e2c5b216cc1c7a9bc26bd2c68226aaed5fc52ca it is possible to be ABI compatible in version 2 with version 1 of the DRI2 interface.
2010-01-15st/xorg: Set enforce version to 1 if not definedJakob Bornecrantz
2010-01-14Merge branch 'mesa_7_7_branch'Jakob Bornecrantz
Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c
2010-01-11st/xorg: move exaMoveInPixmap before trying to fetch itZack Rusin
as Michel suggested, this is a cleaner way of fixing crashes caused by exaGetPixmapDriverPrivate returning null since the data hasn't been moved yet.
2010-01-11st/xorg: fix a rare video crashZack Rusin
sometimes dst isn't present if a window is in a middle of a resize, stop crashing in those cases and just ignore a frame.