summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys/xlib
Commit message (Collapse)AuthorAgeFilesLines
* gallium: squash-merge of gallium screen contextKeith Whitwell2010-02-083-65/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 009598122adf5cad42bf9af067eccaf8e89e1233 Author: Christoph Bumiller <[email protected]> Date: Mon Feb 8 11:03:26 2010 +0000 nouveau: fix gallium-screen-context branch fallout commit 7b2ffc2019d72e833afea7eebf3e80121187375d Merge: 51e190e c036d13 Author: Keith Whitwell <[email protected]> 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 <[email protected]> Date: Thu Feb 4 17:58:02 2010 +0000 gallium: fix some build issues commit f524bdaa723fb181637ad30c6ad708aeedabe25b Merge: f906212 3aba0a2 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 17:51:32 2010 +0000 Merge commit 'origin/master' into gallium-screen-context commit f9062126883199eabf045714c717cd35f4b7b313 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 17:17:12 2010 +0000 gallium/docs: small description of screen::create_context commit efcb37bd3d5ed37f06c6105bd2d750b374ec0927 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:42:42 2010 +0000 drm/radeon: more dead create_context wrapper removal commit 6badc0dd9e06cf2ec936940bcf12b9ef5324b301 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:42:30 2010 +0000 drm/i965: more dead create_context wrapper removal commit cf04ebd5a54b18b2d894cfdab2b0f2fd55626ffc Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:42:05 2010 +0000 st/python: more dead create_context wrapper removal commit 444f114c3516abf71c430e6e9d0d2ae3b80679d3 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:37:58 2010 +0000 idenity: wrapped context creation commit 5a6d09cb9e468d1ee6c8d54b887618819d8d94f2 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:28:47 2010 +0000 ws/gdi: remove dead context_create wrapper commit 132b55f4bec39386ac625f09aaa11f609664024c Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:27:52 2010 +0000 ws/gdi: remove dead context_create wrapper commit 56d2d21a0cdcb197a364049d354c2f15a4fc026a Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:25:38 2010 +0000 st/xorg: use screen::context_create commit 838c5cfe56b2af6c644909bed3c5e7cdd64c336a Author: Keith Whitwell <[email protected]> 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 <[email protected]> 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 <[email protected]> Date: Thu Feb 4 16:15:30 2010 +0000 drm/radeon: remove dead create_context declaration commit bb984eecc25cf23bc77e1c818b81165ba1a07c9a Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:14:58 2010 +0000 nv/drm: remove dead create_context ref commit e809313a44287dc4e16c28e9e74ef3b2b5271aa1 Author: Keith Whitwell <[email protected]> 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 <[email protected]> Date: Thu Feb 4 16:05:28 2010 +0000 r300g: fill in screen::context_create commit 407f12556d16ba0656774d8a1d9ebda22f82f473 Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 16:04:04 2010 +0000 cell: adapt for screen::create_context, untested commit d02b0c6ce321a04c76fdabb09e0e4380ce1c1376 Author: Keith Whitwell <[email protected]> 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 <[email protected]> Date: Thu Feb 4 15:50:08 2010 +0000 stw: adapt for screen::create_context, untested commit c6a64de3eb381bc9a88e9fbdecbf87d77925aaf5 Author: Keith Whitwell <[email protected]> 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 <[email protected]> Date: Thu Feb 4 15:47:55 2010 +0000 nv30: adapt to screen::context_create commit 12f5deb6ed9723e9b5d34577052b8365813ca14e Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:44:47 2010 +0000 nv40: adapt to screen::context_create commit 14baccaa3b6bbb3b91056126f6521828e786dc62 Author: Keith Whitwell <[email protected]> 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 <[email protected]> Date: Thu Feb 4 15:22:27 2010 +0000 llvmpipe: update for screen::create_context, untested commit 0eae17107c950346030e4f7e0ec232f868d3893d Author: Keith Whitwell <[email protected]> Date: Thu Feb 4 15:16:57 2010 +0000 xlib/llvmpipe: remove dead winsys context creation path commit 2f69f9ffaa7e2a01d2483277246ed13051ae4ca3 Author: Keith Whitwell <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Date: Sat May 2 08:57:39 2009 +0100 wgl: Use pipe_screen::context_create. commit 2595a188f93fd903600ef5d8517737ee0592035d Author: José Fonseca <[email protected]> Date: Sat May 2 08:56:47 2009 +0100 trace: Implement pipe_screen::context_create. commit f3640e4ae37a5260cbfba999d079f827de0a313a Author: José Fonseca <[email protected]> Date: Sat May 2 08:56:17 2009 +0100 softpipe: Implement pipe_screen::context_create. commit 347266bddc8bd39c711bacb2193793759d0f3696 Author: José Fonseca <[email protected]> Date: Sat May 2 08:55:31 2009 +0100 gallium: New pipe_screen::context_create callback.
* gallium: Move deprecated pipe/internal/p_winsys_screen.h inside ↵José Fonseca2010-02-024-4/+4
| | | | util/u_simple_screen.h
* gallium: pipe/p_inlines.h -> util/u_inlines.hJosé Fonseca2010-02-024-4/+4
|
* Merge branch 'mesa_7_7_branch'Brian Paul2010-01-221-12/+11
|\ | | | | | | | | | | Conflicts: src/mesa/shader/prog_execute.c
| * xlib/softpipe: more buffer free fixesBrian Paul2010-01-221-12/+11
| | | | | | | | | | | | The previous memory leak fix didn't always work properly. Now check the xm_buffer::smh field (now documented!) to see if the buffer points to shared memory.
* | Merge branch 'mesa_7_7_branch'Brian Paul2010-01-221-5/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * xlib/softpipe: fix buffer memory leakBrian Paul2010-01-201-5/+20
| | | | | | | | Fixes leak caused by window resize.
* | Do not include glapi/dispatch.h outside Mesa core.Chia-I Wu2010-01-211-1/+2
| | | | | | | | | | Include the glapi*.h directly instead. glapi/dispatch.h became a Mesa core header since 22884db174b9fb0736cec1c6a192f8b9a97500c1.
* | Merge branch 'master' into opengl-es-v2Chia-I Wu2010-01-129-216/+298
|\ \ | | | | | | | | | | | | Conflicts: src/mesa/main/dd.h
| * | st/mesa: Remove st_api.c.Chia-I Wu2010-01-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | st_api.c is supposed to define st_api_OpenGL to advertise OpenGL support. However, the linker discards the symbol because it has no user. It is better to leave this to other state trackers that link to libmesagallium.a. Signed-off-by: Chia-I Wu <[email protected]>
| * | scons: Don't build xlib when dri is enabled.José Fonseca2010-01-081-0/+4
| | | | | | | | | | | | Hopefully adddresses fdo 25828.
| * | scons: Output a meaningful message when xlib libGL.so can't be built.José Fonseca2010-01-081-45/+57
| | |
| * | scons: Aggregate all tiny libraries in a single library.José Fonseca2010-01-011-1/+1
| | | | | | | | | | | | | | | Makes integration of gallium into out of tree components much easier. No pratical change for components in this tree,
| * | Merge branch 'mesa_7_7_branch'Brian Paul2009-12-311-0/+209
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/darwin src/gallium/auxiliary/util/u_clear.h src/gallium/state_trackers/xorg/xorg_exa_tgsi.c src/mesa/drivers/dri/i965/brw_draw_upload.c
| | * Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul2009-12-271-0/+209
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/u_network.c src/gallium/auxiliary/util/u_network.h src/gallium/drivers/i915/i915_state.c src/gallium/drivers/trace/tr_rbug.c src/gallium/state_trackers/vega/bezier.c src/gallium/state_trackers/vega/vg_context.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_driver.c src/gallium/winsys/xlib/xlib_brw_context.c src/mesa/main/mtypes.h
| | | * xlib: Use C-style comments.Vinson Lee2009-12-221-2/+2
| | | |
| * | | xlib: Integrate the trace driver with all pipe drivers.José Fonseca2009-12-285-134/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And not just softpipe. It is particularly convenient to use llvmpipe instead, since it is much faster. It also allows to use rbug with all xlib drivers.
| * | | scons: Fix xlib build.José Fonseca2009-12-281-1/+1
| | | | | | | | | | | | | | | | After glsl rework merge.
| * | | Merge branch 'mesa_7_7_branch'Brian Paul2009-12-211-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c
| | * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-12-151-4/+4
| | |\| | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_quad_blend.c
| | | * mesa: Add missing $(DESTDIR) support to src/gallium/winsys/xlib/MakefileMatthew Bell2009-12-141-4/+4
| | | |
| * | | Move the remaining format pf_get_* functions to u_format.h.Michal Krol2009-12-173-12/+12
| | | | | | | | | | | | | | | | | | | | 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-173-34/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * \ \ Merge branch 'gallium-noblocks'Roland Scheidegger2009-12-043-34/+16
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: src/gallium/state_trackers/xorg/xorg_exa.c
| | | * | fixups for interface changes (mostly state trackers)Roland Scheidegger2009-11-303-34/+16
| | | | |
| | * | | 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
| | | |
| * | | Move pf_get_block() to u_format auxiliary module.Michal Krol2009-12-033-3/+6
| |/ /
* / / gallium/xlib: Fix missing symbols when GLX_INDIRECT_RENDERING is defined.Chia-I Wu2009-11-051-0/+30
|/ / | | | | | | | | | | | | | | When GLX_INDIRECT_RENDERING is defined, some symbols are used in libglapi.a but are not defined. Define them through the help of glapitemp.h. Signed-off-by: Chia-I Wu <[email protected]>
* | configs: fix some remains of the i915simple driverZack Rusin2009-10-111-1/+1
| |
* | i965g: remove 965/brw files from XLIB_WINSYS_SOURCESBrian Paul2009-10-051-3/+0
| |
* | i965g: Drop i965simpleJakob Bornecrantz2009-10-058-1240/+0
| | | | | | | | | | | | The driver never work with real hardware and has bitrotted for quite some time now, might as well drop it. If somebody wants to look at it just use git.
* | Merge branch 'softpipe-opt'Keith Whitwell2009-09-231-45/+53
|\ \ | |/ |/| | | | | | | | | Conflicts: progs/demos/cubemap.c src/gallium/drivers/softpipe/sp_tex_sample.c src/gallium/drivers/softpipe/sp_texture.c
| * gallium/xlib: use XSHM for swapbuffersKeith Whitwell2009-07-221-45/+53
| | | | | | | | Makes some difference, but suprisingly little. Barely worth the effort.
* | llvmpipe: asst fixes for 'make linux-llvmpipe'Brian Paul2009-09-112-0/+4
| |
* | gallium/xlib: silence uninitialized var warningBrian Paul2009-09-031-1/+1
| |
* | scons: Tool for LLVM. Gracefully disable llvmpipe if LLVM not found.José Fonseca2009-09-011-6/+6
| |
* | xlib: Implement lp_winsys::destroy.José Fonseca2009-08-301-0/+9
| |
* | xlib: Implement llvmpipe lp_winsys interface.José Fonseca2009-08-291-206/+144
| |
* | xlib: Update llvmpipe integration for changes in master.José Fonseca2009-08-291-0/+1
| |
* | llvmpipe: add missing break in xlib _init()Brian Paul2009-08-291-0/+1
| |
* | llvmpipe: Allow to build without udis86.José Fonseca2009-08-291-1/+1
| |
* | llvmpipe: Disassemble generated x86 code.José Fonseca2009-08-291-0/+8
| |
* | xlib: Complete llvmpipe integration.José Fonseca2009-08-293-1/+11
| |
* | xlib: Integrate with llvmpipe.José Fonseca2009-08-291-0/+513
| | | | | | | | Actually, the makefile/sconscript changes were already commit by mistake.
* | xlib: fix single buffer window resize bugBrian Paul2009-08-241-0/+1
| | | | | | | | | | | | When a single-buffered window was resized the new window size was never detected. This fix that, but there's still a bug which causes window contents corruption for certain window sizes...
* | gallium/xlib: add missing tex_usage parameterBrian Paul2009-08-111-0/+1
| |
* | gallium/xlib: add missing tex_usage parameterBrian Paul2009-08-111-0/+1
|/
* Use separate $(MINSTALL) for installing librariesDan Nicholson2009-06-011-1/+1
| | | | | | | | | | | | | The special feature of bin/minstall to copy symlinks is only ever needed when installing libraries which may have .so symlinks. All the headers and directories can use a normal install program. These two modes are separated as $(INSTALL) and $(MINSTALL) to allow the user (or autoconf) to override installing normal files as they please. An autoconf check for the install program has been added and will be used in preference to minstall when available. Fixes bug 16053.
* mesa: Prepend "-Wl," to linking optionsTormod Volden2009-04-301-1/+1
| | | | | Let mklib ignore -Wl options inside the object list when building static libraries
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 12:14:15 +0000