Mesa (master): gallium: squash-merge of gallium screen context
Keith Whitwell
keithw at kemper.freedesktop.org
Mon Feb 8 13:06:10 UTC 2010
Module: Mesa
Branch: master
Commit: 7f41f5447c8f9113c8956901e1c5fff6081ecd94
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f41f5447c8f9113c8956901e1c5fff6081ecd94
Author: Keith Whitwell <keithw at vmware.com>
Date: Mon Feb 8 12:55:59 2010 +0000
gallium: squash-merge of gallium screen context
Squashed commit of the following:
commit 009598122adf5cad42bf9af067eccaf8e89e1233
Author: Christoph Bumiller <e0425955 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at vmware.com>
Date: Thu Feb 4 16:37:58 2010 +0000
idenity: wrapped context creation
commit 5a6d09cb9e468d1ee6c8d54b887618819d8d94f2
Author: Keith Whitwell <keithw at vmware.com>
Date: Thu Feb 4 16:28:47 2010 +0000
ws/gdi: remove dead context_create wrapper
commit 132b55f4bec39386ac625f09aaa11f609664024c
Author: Keith Whitwell <keithw at vmware.com>
Date: Thu Feb 4 16:27:52 2010 +0000
ws/gdi: remove dead context_create wrapper
commit 56d2d21a0cdcb197a364049d354c2f15a4fc026a
Author: Keith Whitwell <keithw at vmware.com>
Date: Thu Feb 4 16:25:38 2010 +0000
st/xorg: use screen::context_create
commit 838c5cfe56b2af6c644909bed3c5e7cdd64c336a
Author: Keith Whitwell <keithw at 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 at 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 at vmware.com>
Date: Thu Feb 4 16:15:30 2010 +0000
drm/radeon: remove dead create_context declaration
commit bb984eecc25cf23bc77e1c818b81165ba1a07c9a
Author: Keith Whitwell <keithw at vmware.com>
Date: Thu Feb 4 16:14:58 2010 +0000
nv/drm: remove dead create_context ref
commit e809313a44287dc4e16c28e9e74ef3b2b5271aa1
Author: Keith Whitwell <keithw at 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 at vmware.com>
Date: Thu Feb 4 16:05:28 2010 +0000
r300g: fill in screen::context_create
commit 407f12556d16ba0656774d8a1d9ebda22f82f473
Author: Keith Whitwell <keithw at vmware.com>
Date: Thu Feb 4 16:04:04 2010 +0000
cell: adapt for screen::create_context, untested
commit d02b0c6ce321a04c76fdabb09e0e4380ce1c1376
Author: Keith Whitwell <keithw at 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 at vmware.com>
Date: Thu Feb 4 15:50:08 2010 +0000
stw: adapt for screen::create_context, untested
commit c6a64de3eb381bc9a88e9fbdecbf87d77925aaf5
Author: Keith Whitwell <keithw at 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 at vmware.com>
Date: Thu Feb 4 15:47:55 2010 +0000
nv30: adapt to screen::context_create
commit 12f5deb6ed9723e9b5d34577052b8365813ca14e
Author: Keith Whitwell <keithw at vmware.com>
Date: Thu Feb 4 15:44:47 2010 +0000
nv40: adapt to screen::context_create
commit 14baccaa3b6bbb3b91056126f6521828e786dc62
Author: Keith Whitwell <keithw at 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 at vmware.com>
Date: Thu Feb 4 15:22:27 2010 +0000
llvmpipe: update for screen::create_context, untested
commit 0eae17107c950346030e4f7e0ec232f868d3893d
Author: Keith Whitwell <keithw at 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 at 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 at 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 at 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 at vmware.com>
Date: Sat May 2 08:57:39 2009 +0100
wgl: Use pipe_screen::context_create.
commit 2595a188f93fd903600ef5d8517737ee0592035d
Author: José Fonseca <jfonseca at vmware.com>
Date: Sat May 2 08:56:47 2009 +0100
trace: Implement pipe_screen::context_create.
commit f3640e4ae37a5260cbfba999d079f827de0a313a
Author: José Fonseca <jfonseca at vmware.com>
Date: Sat May 2 08:56:17 2009 +0100
softpipe: Implement pipe_screen::context_create.
commit 347266bddc8bd39c711bacb2193793759d0f3696
Author: José Fonseca <jfonseca at vmware.com>
Date: Sat May 2 08:55:31 2009 +0100
gallium: New pipe_screen::context_create callback.
---
src/gallium/docs/source/screen.rst | 9 ++++
src/gallium/drivers/cell/ppu/cell_context.c | 5 +-
src/gallium/drivers/cell/ppu/cell_context.h | 5 +-
src/gallium/drivers/cell/ppu/cell_screen.c | 1 +
src/gallium/drivers/cell/ppu/cell_winsys.h | 5 +--
src/gallium/drivers/i915/i915_context.c | 3 +-
src/gallium/drivers/i915/i915_context.h | 5 ++
src/gallium/drivers/i915/i915_screen.c | 2 +
src/gallium/drivers/i915/intel_winsys.h | 4 --
src/gallium/drivers/i965/brw_context.c | 4 +-
src/gallium/drivers/i965/brw_context.h | 4 ++
src/gallium/drivers/i965/brw_screen.c | 1 +
src/gallium/drivers/i965/brw_winsys.h | 4 --
src/gallium/drivers/identity/id_context.c | 2 +-
src/gallium/drivers/identity/id_context.h | 4 ++
src/gallium/drivers/identity/id_drm.c | 17 -------
src/gallium/drivers/identity/id_public.h | 3 -
src/gallium/drivers/identity/id_screen.c | 16 +++++++
src/gallium/drivers/llvmpipe/lp_context.c | 3 +-
src/gallium/drivers/llvmpipe/lp_context.h | 4 ++
src/gallium/drivers/llvmpipe/lp_screen.c | 2 +
src/gallium/drivers/llvmpipe/lp_winsys.h | 3 -
src/gallium/drivers/nouveau/nouveau_winsys.h | 9 ----
src/gallium/drivers/nv30/nv30_context.c | 4 +-
src/gallium/drivers/nv30/nv30_context.h | 5 ++-
src/gallium/drivers/nv30/nv30_screen.c | 4 +-
src/gallium/drivers/nv30/nv30_screen.h | 2 +-
src/gallium/drivers/nv30/nv30_state_emit.c | 6 ++-
src/gallium/drivers/nv40/nv40_context.c | 4 +-
src/gallium/drivers/nv40/nv40_context.h | 5 ++-
src/gallium/drivers/nv40/nv40_screen.c | 1 +
src/gallium/drivers/nv40/nv40_screen.h | 2 +-
src/gallium/drivers/nv40/nv40_state_emit.c | 6 ++-
src/gallium/drivers/nv50/nv50_context.c | 4 +-
src/gallium/drivers/nv50/nv50_context.h | 5 ++-
src/gallium/drivers/nv50/nv50_screen.c | 1 +
src/gallium/drivers/nv50/nv50_screen.h | 1 -
src/gallium/drivers/nv50/nv50_state_validate.c | 10 ++--
src/gallium/drivers/r300/r300_context.c | 4 +-
src/gallium/drivers/r300/r300_context.h | 4 ++
src/gallium/drivers/r300/r300_screen.c | 3 +
src/gallium/drivers/r300/r300_screen.h | 5 +-
src/gallium/drivers/r300/r300_winsys.h | 7 ++-
src/gallium/drivers/softpipe/sp_context.c | 4 +-
src/gallium/drivers/softpipe/sp_context.h | 3 +
src/gallium/drivers/softpipe/sp_screen.c | 2 +
src/gallium/drivers/softpipe/sp_video_context.c | 2 +-
src/gallium/drivers/softpipe/sp_winsys.h | 1 -
src/gallium/drivers/svga/svga_context.c | 4 +-
src/gallium/drivers/svga/svga_context.h | 4 ++
src/gallium/drivers/svga/svga_screen.c | 1 +
src/gallium/drivers/svga/svga_winsys.h | 3 -
src/gallium/drivers/trace/tr_context.c | 17 ++------
src/gallium/drivers/trace/tr_context.h | 5 +-
src/gallium/drivers/trace/tr_drm.c | 19 --------
src/gallium/drivers/trace/tr_screen.c | 26 +++++++++++
src/gallium/include/pipe/p_screen.h | 3 +
src/gallium/include/state_tracker/drm_api.h | 2 -
src/gallium/state_trackers/dri/dri_context.c | 6 +--
src/gallium/state_trackers/egl/common/egl_g3d.c | 7 ++-
src/gallium/state_trackers/egl/common/native.h | 5 --
src/gallium/state_trackers/egl/kms/native_kms.c | 12 -----
src/gallium/state_trackers/egl/x11/native_dri2.c | 13 ------
src/gallium/state_trackers/egl/x11/native_ximage.c | 11 -----
src/gallium/state_trackers/glx/xlib/xm_api.c | 10 ++--
src/gallium/state_trackers/glx/xlib/xm_winsys.h | 7 ---
src/gallium/state_trackers/python/st_device.c | 11 +----
src/gallium/state_trackers/python/st_device.h | 1 -
.../state_trackers/python/st_hardpipe_winsys.c | 17 +-------
.../state_trackers/python/st_llvmpipe_winsys.c | 9 +----
.../state_trackers/python/st_softpipe_winsys.c | 3 +-
src/gallium/state_trackers/python/st_winsys.h | 3 -
src/gallium/state_trackers/wgl/stw_context.c | 28 +-----------
src/gallium/state_trackers/wgl/stw_ext_gallium.c | 26 +-----------
src/gallium/state_trackers/wgl/stw_winsys.h | 3 -
src/gallium/state_trackers/xorg/xorg_exa.c | 5 ++-
src/gallium/winsys/drm/i965/gem/i965_drm_api.c | 6 ---
src/gallium/winsys/drm/i965/xlib/xlib_i965.c | 19 --------
src/gallium/winsys/drm/intel/gem/intel_drm_api.c | 7 ---
.../winsys/drm/nouveau/drm/nouveau_drm_api.c | 45 --------------------
.../winsys/drm/nouveau/drm/nouveau_drm_api.h | 3 -
src/gallium/winsys/drm/radeon/core/radeon_drm.c | 14 ------
src/gallium/winsys/drm/radeon/core/radeon_drm.h | 2 -
.../drm/radeon/python/radeon_hardpipe_winsys.c | 8 ----
src/gallium/winsys/drm/vmware/core/vmw_context.c | 5 --
src/gallium/winsys/drm/vmware/core/vmw_context.h | 3 -
.../winsys/drm/vmware/core/vmw_screen_dri.c | 7 ---
src/gallium/winsys/gdi/gdi_llvmpipe_winsys.c | 6 ---
src/gallium/winsys/gdi/gdi_softpipe_winsys.c | 8 ----
src/gallium/winsys/xlib/xlib_cell.c | 26 -----------
src/gallium/winsys/xlib/xlib_llvmpipe.c | 20 ---------
src/gallium/winsys/xlib/xlib_softpipe.c | 19 --------
92 files changed, 193 insertions(+), 476 deletions(-)
Diff: http://cgit.freedesktop.org/mesa/mesa/diff/?id=7f41f5447c8f9113c8956901e1c5fff6081ecd94
More information about the mesa-commit
mailing list