History log of /external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
a2fc42b899de22273c1df96091bfb5c636075cb0 11-Jan-2012 Ben Skeggs <bskeggs@redhat.com> nv30: import new driver for GeForce FX/6/7 chipsets, and Quadro variants

The primary motivation for this rewrite was to have a maintainable driver
going forward, as nvfx was quite horrible in a lot of ways.

The driver is heavily based on the design of the nv50/nvc0 3d drivers we
already have, and uses the same common buffer/fence code. It also passes
a HEAP more piglit tests than nvfx did, supports a couple more features,
and a few more to come still probably.

The CPU footprint of this driver is far far less than nvfx, and translates
into far greater framerates in a lot of applications (unless you're using
a CPU that's way way newer than the GPUs of these generations....)

Basically, we once again have a maintained driver for these chipsets \o/

Feel free to report bugs now!
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
6992be543383ba0850bd813153def24ab4e28911 21-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: fully unify nv[34]0_context.h

Move the remaining content to the common header.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
840c36f5e6d940343a3154af7e76fec341ca46e6 21-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: non-trivially unify nv[34]0_vertprog.c

vertprog.c is similar but has substantial differences:
1. nv40 supports clip planes
2. nv40 uses a more advanced register allocator
3. Some register setup is different
4. Constants with the same name have different values

This patch unifies the two files.
nv30 gains clip plane support and the nv40 register allocator.

A new NVFX_VP(x) macro is introduced that at runtime resolved to
either the nv30 or the nv40 constant value.

nv30 clip planes are not tested and might not work
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
c65a8f3ed2ab1650df38a3ed32d1e91e84b50520 21-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: partially unify nv[34]0_state.c

state.c is identical except for:
1. Sampler state creation is different
2. nv40 swtnl support
3. Separate blend equations on nv40

This patch unifies nv[34]0_state.c, except the sampler state creation code.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
6e1d0fc5eba8cda4f4c8f3188f53fec6d2d2e9c3 21-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: unify nv[34]0_vbo.c

The files are identical, except for swtnl support which is commented
out on nv30 and restart being initialized on nv30 to avoid a compiler
warning.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
f9eafeca297497a94c438ea28ed59f3a45ed2566 21-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: non-trivially unify nv[34]0_draw.c

nv30_draw.c is a stub.

This patch makes both nv30 and nv40 use the nv40 swtnl path.

Note that this doesn't actually work on nv30 because the vertex program is
encoded in the nv40-only layout.

However, swtnl was unimplemented before on nv30, so this is not a regression.
Furthermore, a patch to fix this is available near the end of the patchset.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
bcb37411fc9159a5c1af50b7defbf1f526b50793 21-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: non-trivially unify nv[34]0_fragprog.c

The files are mostly the same except:
1. On NV40, some TGSI instructions are emulated with several hardware ones
2. Some instructions such as DDX/DDY, and STR were missing from nv30
3. NV40 has more sophisticated register management

nv30 now supports all instructions and uses the nv40 register management.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
cd0d03adab65a9586e0c5d60e9ee487677914f3b 21-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: non-trivially unify nv[34]0_state_fb.c

The files are significantly different due to:
1. nv30 support 2 render targets, nv40 4
2. z-buffer pitch is set differently
3. nv30 has a limitation of colour_bits >= zeta_bits. This may not
actually exist in the driver though
4. nv30 points color0 at depth in the depth-only case
5. nv30 sets NV34TCL_VIEWPORT_TX_ORIGIN to 0. This is probably
unnecessary

This patch attempts to unify the two files and preserve the existing
behavior.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
4d93ef1a015c8ec7341b0793e87ec375014436b3 20-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: unify nv[34]0_state_viewport.c

The files are identical, except for an extra comment in nv30.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
9937116c7b15468088a224da478d927347a76f32 20-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: unify nv[34]0_query.c

The files are identical except formatting.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
8611a31bb401fcc2bdc0b3624859fffff7236c4b 20-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: unify nv[34]0_miptree.c

The only difference between nv30 and nv40 is that nv30 allowed swizzling
for more texture types.

This patch preserves the existing behavior, using conditional code.

Note however that this does not make sense, since all texture types can
be swizzled on nv40 and probably on nv30 too.

However, the handling of swizzled surfaces in the current 2D code is
partially broken, so it's best not to touch this.

A whole rewrite of the 2D code will be submitted, which will solve this
problem.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
e392e0b148d6b499322e58a84f300e2e0be49e29 20-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: unify nv[34]0_state_stipple.c

The files are identical, except for the fact that the nv40 version
forgets to unreference the stateobj.

Unified to the correct nv30 version.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
64d882637dc97b332eb3c0f457376f86b75c8c5f 20-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: unify identical nv[34]0_state_zsa.c
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
938c6905cfa4e25c8e898c8d91ee0fe8174abe0b 20-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: unify identical nv[34]0_state_scissor.c
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
ada801222b3c984c260165415864a8f511145251 20-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: unify identical nv[34]0_state_rasterizer.c
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
0b55e1cd17801a03d6fbb7ce46f25aa2b086bff4 20-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: unify identical nv[34]0_state_blend.c
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
778c64da97272e7508dbcdf0bffdb699d1b04ce0 21-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: non-trivially unify nv[34]0_state_emit.c

The files are the same except for swtnl support on nv40 and for
texture cache flushing on nv40.

Unify them, and use a macro to define 4 versions of render_states,
for all combinations of nvfx and hwtnl/swtnl.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
d084d189d03dc89a3161a131f1b386840c06ad61 20-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: unify identical nv[34]0_transfer.c
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
c5c7b69bda3fb49fd88b846feb6e65289a04488a 20-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: unify identical nv[34]0_clear.c
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
b8e56d4cddbd9c491b940e3ce5974c526802c752 20-Feb-2010 Luca Barbieri <luca@luca-barbieri.com> nv30, nv40: unify all structures and headers, except shaders

This patch unifies nv[34]0_screen.h, nv[34]0_context.h and
nv[34]0_state.h

The unified files are put in a new "nvfx" directory.

nv30_context.h and nv40_context.h still exist to hold the function
prototypes and include nvfx_context.h

nv[34]0_screen.h and nv[34]0_state.h are deleted, replaced by the
unified versions.

nv40 includes some extra fields for swtnl and user clip planes
support.

These fields will be unused on nv30 until that functionality gets
added to it too (by unification with nv40).
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
b43c182f19c6291c88420fa12714f952c2b461fb 11-Mar-2010 Keith Whitwell <keithw@vmware.com> Squashed commit of gallium-context-transfers:

commit 7a2ee04629681e59ea147b440856c4f9a33ae9f8
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Mar 11 14:19:17 2010 +0000

nv: convert to context transfers

commit 188a3f5331c8e5966729fd59d02975afb7324adc
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Mar 11 14:11:10 2010 +0000

nouveau: remove unused variable

commit 5c8e880ab4dc020358c08728b8adb1637d2dc5bc
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Mar 11 12:31:21 2010 +0000

mesa/st: fix compilation after merge

commit c552595333f860c2a4807e195596acdf5d6a5ef8
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Mar 11 12:31:06 2010 +0000

util: fix compilation after merge

commit e80836878a3617b0e350d2a8f92311832a1476cb
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Mar 11 12:30:47 2010 +0000

r300g: fix compilation after merge

commit 0e4883e9511b9db4e75a4dbc78d7bb970badc15d
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Mar 11 12:18:45 2010 +0000

i965g: fix incorrect merge

commit 17d74133d8168eebf93bf1390de79930fc8da231
Merge: cb81c79 aa311ae
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Mar 11 12:08:32 2010 +0000

Merge commit 'origin/master' into gallium-context-transfers

Conflicts:
src/gallium/drivers/i965/brw_screen_texture.c
src/gallium/drivers/r300/r300_screen.c
src/gallium/drivers/softpipe/sp_texture.c
src/gallium/drivers/svga/svga_screen_texture.c
src/gallium/state_trackers/egl/x11/native_ximage.c

commit cb81c79098bc3a92a4d2a3dcc0edc972dfb407be
Author: Keith Whitwell <keithw@vmware.com>
Date: Tue Mar 2 16:04:01 2010 +0000

egl/x11: hack for context transfers

There is a better approach to this in the winsys-handle branch, but
for now avoid using transfers at all by always allocating our own
backing store directly.

commit f44a24e1d4ad7563f3eedd6b3a5688f53a36265c
Author: Keith Whitwell <keithw@vmware.com>
Date: Tue Mar 2 16:03:16 2010 +0000

llvmpipe: context transfers

commit 4d7475ef8104b3b478c7c6ce77cd3506c57e25d1
Author: Keith Whitwell <keithw@vmware.com>
Date: Tue Mar 2 16:02:50 2010 +0000

llvmpipe: disable testprogs build

Not working.

commit a9bf98c4d36bd92a76f81e83747eb9b8f0a0515f
Merge: ee0f97e 0c616da
Author: Keith Whitwell <keithw@vmware.com>
Date: Tue Mar 2 15:28:25 2010 +0000

Merge commit 'origin/master' into gallium-context-transfers

Conflicts:
src/mesa/state_tracker/st_cb_accum.c
src/mesa/state_tracker/st_cb_bitmap.c

commit ee0f97e8d9fd5ef57211a8e1268f505c9829e246
Merge: a7f078e 828f545
Author: Keith Whitwell <keithw@vmware.com>
Date: Fri Feb 19 13:00:29 2010 +0000

Merge commit 'origin/master' into gallium-context-transfers

Conflicts:
src/gallium/auxiliary/util/u_debug.h
src/gallium/drivers/i915/i915_context.h
src/gallium/drivers/llvmpipe/lp_flush.c
src/gallium/drivers/nv30/nv30_screen.h
src/gallium/drivers/nv40/nv40_context.h
src/gallium/drivers/nv40/nv40_screen.h
src/gallium/drivers/nv50/nv50_context.h
src/gallium/drivers/r300/r300_screen.c
src/gallium/drivers/r300/r300_winsys.h
src/gallium/drivers/softpipe/sp_context.c
src/gallium/drivers/trace/tr_context.c
src/gallium/state_trackers/dri/dri_context.c
src/gallium/state_trackers/egl/common/egl_g3d.c
src/gallium/state_trackers/python/st_device.c
src/gallium/winsys/drm/radeon/core/radeon_drm.c

commit a7f078e16d851b53ef316066dcced46eb39ebe24
Author: Keith Whitwell <keithw@vmware.com>
Date: Fri Feb 5 14:16:11 2010 +0000

gallium: move texture transfers to pipe_context

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.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
685340a53e1dcb2a888e634ee71ba24356befe69 09-Mar-2010 Roland Scheidegger <sroland@vmware.com> Merge branch 'gallium-vertexelementcso'

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
5bf4ff7dabfffd0018382d440682bd5f7d418606 01-Mar-2010 Roland Scheidegger <sroland@vmware.com> nv30: adapt to vertex element cso
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
63cb6f59eac91ba34cf80ff3736568e40b094fe1 22-Feb-2010 Michal Krol <michal@vmware.com> gallium: Remove bypass_vs_clip_and_viewport from rasteriser state.

Needs testing.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
bedb6faec0882cf01ae8773f2ea685135471a87b 11-Feb-2010 Roland Scheidegger <sroland@vmware.com> nv30: adapt to stencil ref changes

not sure if this has any hope of working
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
7f41f5447c8f9113c8956901e1c5fff6081ecd94 08-Feb-2010 Keith Whitwell <keithw@vmware.com> gallium: squash-merge of gallium screen context

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.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
adf4c1ae10c172222690bf8ec2496cec8ce151dd 04-Feb-2010 Dave Airlie <airlied@redhat.com> nouveau: include stdio.h and u_inlines.h in all context files since embedded changes

fixes nouveau build for me.

Signed-off-by: Dave Airlie <airlied@redhat.com>
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
29d2ab37e65c9242d01f63cc5376cb6929f9285f 29-Dec-2009 Marcin Slusarz <marcin.slusarz@gmail.com> nouveau: kill nouveau_push.h and use libdrm versions of BEGIN_RINGs, etc
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
c727fa6dbf5a9fca5fc94de06c309f54402449d1 05-Jan-2010 Keith Whitwell <keithw@vmware.com> Merge commit 'origin/gallium-draw-retval'

Conflicts:
src/gallium/drivers/identity/id_context.c
35e8283c69d80debb44b05ea79dc5f67303a7432 22-Dec-2009 Roland Scheidegger <sroland@vmware.com> Merge branch 'gallium-edgeflags'

Conflicts:
src/mesa/state_tracker/st_draw.c
03f212b0d85fed5dec9a855fb6d079e5fdb60ac9 21-Dec-2009 Keith Whitwell <keithw@vmware.com> gallium: propogate draw retval changes into more drivers
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
429f0e3b37e33a33289f8488369474b20bfd5247 19-Dec-2009 Roland Scheidegger <sroland@vmware.com> gallium: fix up drivers for edgeflag changes

several drivers which chose to ignore edgeflags might require some more work,
while edgeflags never worked there they might now crash.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
41b52aa3362665e08bdc2f75cc9bfdc4debc6eb0 04-Dec-2009 Maarten Maathuis <madman2003@gmail.com> nouveau: avoid running out of relocs

- Added flush notify functions for NV30 and NV40.
- Flushing mid frame will call flush notify, which will resubmit all
relocs.
- We don't try to recover from reloc failure yet.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
35b98e2884bd7c76c43fa08d5bb0a8f1396d3298 19-Oct-2009 Ben Skeggs <bskeggs@redhat.com> nouveau: implement is_{texture,buffer}_referenced properly
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
eb168e26aa63f11a47d70c4555cae30691a2cd57 04-Apr-2009 Michel Dänzer <daenzer@vmware.com> gallium: Clean up driver clear() interface.

Only allows clearing currently bound buffers, but colour and depth/stencil in
a single call.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
f302fca5eb63e4bca8af5b35c585451486143e6a 10-Sep-2008 Ben Skeggs <skeggsb@gmail.com> nouveau: gallium directory structure changed again..
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
12118fcd123992f48ce78629e79e9949b96cd525 12-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Emit vertex buffer objects using state objects
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
ac44f334e3492ab68eb310cfe43ed22206a042d8 12-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Move edgeflag stuff
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
3d0e18ff5fba368a66bf34d18d219bf9a2dfba90 12-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Reorder, remove useless stuff
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
4ca346a8c0d0d4ea38705f8d3a3e5e690aa77daf 12-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Rename state emission func
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
58737dc87575625438d288fe2f816b6a9d2086f1 12-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Emit fragment program using state objects
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
2419a5fe3601851989506a11b0bd4e3cfb071035 12-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Emit vertex program using state objects
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
c7086277546d065eb94ba8dbeca1620605f167ea 11-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Move constant buffers out of vert/frag prog structures
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
5acbd0b0961089f9553adbe9b3d1341997ccb220 11-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Emit fragtex state using state objects
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
f99643ca6ea3aa05a0b16dc5d99e11fa00185684 04-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Emit sampler state using state objects
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
568b477b9c118e5ace831b8ecf1811da1c0961cd 03-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Emit viewport state using state objects
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
e7e231a5116aed9f1ca685a297032a3e3e6a2433 03-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Emit polygon stipple state using state objects
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
f1d24c1d27255e4ff5ba451e6d58558f9ccdc801 03-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Emit scissor state using state objects
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
c66f376e271427799f777c39bc9221df7c961f77 03-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Emit depth/stencil/alpha state using state objects
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
360f7a3e239553fc0e1aff3b38c06c2e3d0a698c 03-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Emit rasterizer state using state objects
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
c0e9eb3b095c9769d3deacf4ad4470bd155acdcd 03-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Emit blend state using state objects
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
52cf7a6c1ccc987859834b640a5ec0a62f84134a 03-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Emit blend color state using state objects
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
36488ed052a18f7eafef1d1c5c18b20ad508b2b7 03-Jul-2008 Patrice Mandin <pmandin@caramail.com> nv30: Emit framebuffer state using state objects
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
95fe122f67024f55d555e2816a95409a8b53a49e 23-Jun-2008 Patrice Mandin <pmandin@caramail.com> nv30: add state zsa, based on nv40 one
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
0e1b36b0b257bfba4427a1e6e12c918e744b9977 23-Jun-2008 Patrice Mandin <pmandin@caramail.com> nv30: add state viewport, based on nv40 one
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
d4bc56ca49ef39f9f083a2e5adeb3e89ca3bf538 23-Jun-2008 Patrice Mandin <pmandin@caramail.com> nv30: add state stipple, based on nv40 one
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
e5bbb18441f34824dc4f9f857b30c71c4ff6466f 23-Jun-2008 Patrice Mandin <pmandin@caramail.com> nv30: add state scissor, based on nv40 one
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
8b72737a0ba33343673111261265c59546b408c6 23-Jun-2008 Patrice Mandin <pmandin@caramail.com> nv30: add state rasterizer, based on nv40 one
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
5fea663b5f7abcdca00c5ff5d1b77f200b0d06ec 21-Jun-2008 Patrice Mandin <pmandin@caramail.com> nv30: Add state for blend
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
5e1d657d50c247d903b865572bd3e74048e8a8f1 20-Jun-2008 Patrice Mandin <pmandin@caramail.com> nv30: Add separate nv30 state stuff for fb, based on nv40 one, need to use it now
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
fa4b2439d4f240a5e573d4ea198b829791d614f4 26-May-2008 Ben Skeggs <skeggsb@gmail.com> nouveau: very quick port to tex-surface changes.

probably the last match-gallium-upstream merge for a bit, some cleanup+nv50
work coming RSN...
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
1ef08564d2a201a422db772a6bb23d1129888304 12-May-2008 Ben Skeggs <skeggsb@gmail.com> nouveau: remove chipset fields in all nv pipe driver context/screen structs.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
7d2085bd7d9378703bfff3d974536ff5e9fd9b30 15-Apr-2008 Ben Skeggs <skeggsb@gmail.com> nouveau: PIPE_ATTRIB_MAX -> PIPE_MAX_ATTRIBS
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
186277ee928a7c9ad8a31776f93e502613ad94fd 11-Apr-2008 Patrice Mandin <pmandin@caramail.com> nv30: Move some structures and functions from context to screen
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
75e714d476eb573a6e06585341ce693434eb237e 18-Mar-2008 Patrice Mandin <pmandin@caramail.com> nv30: disable emit texture image in state_emit, already done in fragtex
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
a514aeb77899816d82c5b31f3bf2206d82d68893 18-Mar-2008 Patrice Mandin <pmandin@caramail.com> nv30: update miptree stuff for texturing
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
a33da10b6c999a8ea348789ea13d2147f117a722 17-Mar-2008 Patrice Mandin <pmandin@caramail.com> nv30: only 2 render targets
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
84cc07dc89c0ebce4ad55b4b3684d4420a202683 29-Feb-2008 Ben Skeggs <skeggsb@gmail.com> nouveau: implement pipe_screen

Untested on NV3x/NV5x. Quite possibly broken.
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h
26add9288c88108e3485ffc57c51ea9bdc0ee719 16-Feb-2008 Ben Skeggs <skeggsb@gmail.com> nouveau: match gallium code reorginisation.

That was... fun..
/external/mesa3d/src/gallium/drivers/nv30/nv30_context.h