History log of /external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
c61d3fe8bddcbcf750c5f057a45b262fea92ca5e 03-Aug-2012 Brian Paul <brianp@vmware.com> st/xorg: updates for CSO interface changes
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
2bb2e6a6e3017d462be0ae9308955f37c5ee03c6 06-Jun-2012 Dave Airlie <airlied@redhat.com> xorg: port to new compat API.

Signed-off-by: Dave Airlie <airlied@redhat.com>
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
3bcb9a858f482c21bc7c4d0fcd3571e25ea95090 23-Aug-2011 Michel Dänzer <michel.daenzer@amd.com> st/xorg: Fix solid fills for formats other than PICT_a8r8g8b8.

Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
fe20edf959c4ec565ef29f2556e03ce36e0c259f 16-May-2011 Marcin Slusarz <marcin.slusarz@gmail.com> st/xorg: fix crash triggered by rendercheck -t composite -f a8r8g8b8 -o Src, Saturate

samplers[0] may remain uninititialized if src picture/pixmap is null
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
54d1b718b897742bf424f61f911e4ca8bbffa689 16-May-2011 Marcin Slusarz <marcin.slusarz@gmail.com> st/xorg: fix crash triggered by rendercheck -t blend -f a8r8g8b8 -o Clear
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
4c7001462607e6e99e474d6271dd481d3f8f201c 02-Dec-2010 Roland Scheidegger <sroland@vmware.com> gallium: support for array textures and related changes

resources have a array_size parameter now.
get_tex_surface and tex_surface_destroy have been renamed to create_surface
and surface_destroy and moved to context, similar to sampler views (and
create_surface now uses a template just like create_sampler_view). Surfaces
now really should only be used for rendering. In particular they shouldn't be
used as some kind of 2d abstraction for sharing a texture. offset/layout fields
don't make sense any longer and have been removed, width/height should go too.
surfaces and sampler views now specify a layer range (for texture resources),
layer is either array slice, depth slice or cube face.
pipe_subresource is gone array slices (or cube faces) are now treated the same
as depth slices in transfers etc. (that is, they use the z coord of the
respective functions).

Squashed commit of the following:

commit a45bd509014743d21a532194d7b658a1aeb00cb7
Merge: 1aeca28 32e1e59
Author: Roland Scheidegger <sroland@vmware.com>
Date: Thu Dec 2 04:32:06 2010 +0100

Merge remote branch 'origin/master' into gallium-array-textures

Conflicts:
src/gallium/drivers/i915/i915_resource_texture.c
src/gallium/drivers/i915/i915_state_emit.c
src/gallium/drivers/i915/i915_surface.c

commit 1aeca287a827f29206078fa1204715a477072c08
Merge: 912f042 6f7c8c3
Author: Roland Scheidegger <sroland@vmware.com>
Date: Thu Dec 2 00:37:11 2010 +0100

Merge remote branch 'origin/master' into gallium-array-textures

Conflicts:
src/gallium/state_trackers/vega/api_filters.c
src/gallium/state_trackers/vega/api_images.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/st_inlines.h
src/gallium/state_trackers/vega/vg_context.c
src/gallium/state_trackers/vega/vg_manager.c

commit 912f042e1d439de17b36be9a740358c876fcd144
Author: Roland Scheidegger <sroland@vmware.com>
Date: Wed Dec 1 03:01:55 2010 +0100

gallium: even more compile fixes after merge

commit 6fc95a58866d2a291def333608ba9c10c3f07e82
Author: Roland Scheidegger <sroland@vmware.com>
Date: Wed Dec 1 00:22:26 2010 +0100

gallium: some fixes after merge

commit a8d5ffaeb5397ffaa12fb422e4e7efdf0494c3e2
Merge: f7a202f 2da02e7
Author: Roland Scheidegger <sroland@vmware.com>
Date: Tue Nov 30 23:41:26 2010 +0100

Merge remote branch 'origin/master' into gallium-array-textures

Conflicts:
src/gallium/drivers/i915/i915_state_emit.c
src/gallium/state_trackers/vega/api_images.c
src/gallium/state_trackers/vega/vg_context.c

commit f7a202fde2aea2ec78ef58830f945a5e214e56ab
Author: Roland Scheidegger <sroland@vmware.com>
Date: Wed Nov 24 19:19:32 2010 +0100

gallium: even more fixes/cleanups after merge

commit 6895a7f969ed7f9fa8ceb788810df8dbcf04c4c9
Author: Roland Scheidegger <sroland@vmware.com>
Date: Wed Nov 24 03:07:36 2010 +0100

gallium: more compile fixes after merge

commit af0501a5103b9756bc4d79167bd81051ad6e8670
Author: Roland Scheidegger <sroland@vmware.com>
Date: Tue Nov 23 19:24:45 2010 +0100

gallium: lots of compile fixes after merge

commit 0332003c2feb60f2a20e9a40368180c4ecd33e6b
Merge: 26c6346 b6b91fa
Author: Roland Scheidegger <sroland@vmware.com>
Date: Tue Nov 23 17:02:26 2010 +0100

Merge remote branch 'origin/master' into gallium-array-textures

Conflicts:
src/gallium/auxiliary/gallivm/lp_bld_sample.c
src/gallium/auxiliary/util/u_blit.c
src/gallium/auxiliary/util/u_blitter.c
src/gallium/auxiliary/util/u_inlines.h
src/gallium/auxiliary/util/u_surface.c
src/gallium/auxiliary/util/u_surfaces.c
src/gallium/docs/source/context.rst
src/gallium/drivers/llvmpipe/lp_rast.c
src/gallium/drivers/nv50/nv50_state_validate.c
src/gallium/drivers/nvfx/nv04_surface_2d.c
src/gallium/drivers/nvfx/nv04_surface_2d.h
src/gallium/drivers/nvfx/nvfx_buffer.c
src/gallium/drivers/nvfx/nvfx_miptree.c
src/gallium/drivers/nvfx/nvfx_resource.c
src/gallium/drivers/nvfx/nvfx_resource.h
src/gallium/drivers/nvfx/nvfx_state_fb.c
src/gallium/drivers/nvfx/nvfx_surface.c
src/gallium/drivers/nvfx/nvfx_transfer.c
src/gallium/drivers/r300/r300_state_derived.c
src/gallium/drivers/r300/r300_texture.c
src/gallium/drivers/r600/r600_blit.c
src/gallium/drivers/r600/r600_buffer.c
src/gallium/drivers/r600/r600_context.h
src/gallium/drivers/r600/r600_screen.c
src/gallium/drivers/r600/r600_screen.h
src/gallium/drivers/r600/r600_state.c
src/gallium/drivers/r600/r600_texture.c
src/gallium/include/pipe/p_defines.h
src/gallium/state_trackers/egl/common/egl_g3d_api.c
src/gallium/state_trackers/glx/xlib/xm_st.c
src/gallium/targets/libgl-gdi/gdi_softpipe_winsys.c
src/gallium/targets/libgl-gdi/libgl_gdi.c
src/gallium/tests/graw/tri.c
src/mesa/state_tracker/st_cb_blit.c
src/mesa/state_tracker/st_cb_readpixels.c

commit 26c6346b385929fba94775f33838d0cceaaf1127
Author: Roland Scheidegger <sroland@vmware.com>
Date: Mon Aug 2 19:37:21 2010 +0200

fix more merge breakage

commit b30d87c6025eefe7f6979ffa8e369bbe755d5c1d
Merge: 9461bf3 1f1928d
Author: Roland Scheidegger <sroland@vmware.com>
Date: Mon Aug 2 19:15:38 2010 +0200

Merge remote branch 'origin/master' into gallium-array-textures

Conflicts:
src/gallium/drivers/llvmpipe/lp_rast.c
src/gallium/drivers/llvmpipe/lp_rast_priv.h
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_screen_buffer.c
src/gallium/drivers/r300/r300_state_derived.c
src/gallium/drivers/r300/r300_texture.c
src/gallium/drivers/r300/r300_texture.h
src/gallium/drivers/r300/r300_transfer.c
src/gallium/drivers/r600/r600_screen.c
src/gallium/drivers/r600/r600_state.c
src/gallium/drivers/r600/r600_texture.c
src/gallium/drivers/r600/r600_texture.h
src/gallium/state_trackers/dri/common/dri1_helper.c
src/gallium/state_trackers/dri/sw/drisw.c
src/gallium/state_trackers/xorg/xorg_exa.c

commit 9461bf3cfb647d2301364ae29fc3084fff52862a
Merge: 17492d7 0eaccb3
Author: Roland Scheidegger <sroland@vmware.com>
Date: Thu Jul 15 20:13:45 2010 +0200

Merge commit 'origin/master' into gallium-array-textures

Conflicts:
src/gallium/auxiliary/util/u_blitter.c
src/gallium/drivers/llvmpipe/lp_rast.c
src/gallium/drivers/llvmpipe/lp_surface.c
src/gallium/drivers/r300/r300_render.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/r300/r300_texture.c
src/gallium/drivers/r300/r300_transfer.c
src/gallium/tests/trivial/quad-tex.c

commit 17492d705e7b7f607b71db045c3bf344cb6842b3
Author: Roland Scheidegger <sroland@vmware.com>
Date: Fri Jun 18 10:58:08 2010 +0100

gallium: rename element_offset/width fields in views to first/last_element

This is much more consistent with the other fields used there
(first/last level, first/last layer).
Actually thinking about removing the ugly union/structs again and
rename first/last_layer to something even more generic which could also
be used for buffers (like first/last_member) without inducing headaches.

commit 1b717a289299f942de834dcccafbab91361e20ab
Author: Roland Scheidegger <sroland@vmware.com>
Date: Thu Jun 17 14:46:09 2010 +0100

gallium: remove PIPE_SURFACE_LAYOUT_LINEAR definition

This was only used by the layout field of pipe_surface, but this
driver internal stuff is gone so there's no need for this driver independent
layout definition neither.

commit 10cb644b31b3ef47e6c7b55e514ad24bb891fac4
Merge: 5691db9 c85971d
Author: Roland Scheidegger <sroland@vmware.com>
Date: Thu Jun 17 12:20:41 2010 +0100

Merge commit 'origin/master' into gallium-array-textures

Conflicts:
src/gallium/docs/source/glossary.rst
src/gallium/tests/graw/fs-test.c
src/gallium/tests/graw/gs-test.c

commit 5691db960ca3d525ce7d6c32d9c7a28f5e907f3b
Author: Roland Scheidegger <sroland@vmware.com>
Date: Thu Jun 17 11:29:03 2010 +0100

st/wgl: fix interface changes bugs

commit 2303ec32143d363b46e59e4b7c91b0ebd34a16b2
Author: Roland Scheidegger <sroland@vmware.com>
Date: Wed Jun 16 19:42:32 2010 +0100

gallium: adapt code to interface changes...

commit dcae4f586f0d0885b72674a355e5d56d47afe77d
Author: Roland Scheidegger <sroland@vmware.com>
Date: Wed Jun 16 19:42:05 2010 +0100

gallium: separate depth0 and array_size in the resource itself.

These fields are still mutually exclusive (since no 3d array textures exist)
but it ultimately seemed to error-prone to adapt all code accept the new
meaning of depth0 (drivers stick that into hardware regs, calculate mipmap
sizes etc.). And it isn't really cleaner anyway.
So, array textures will have depth0 of 1, but instead use array_size,
3D textures will continue to use depth0 (and have array_size of 1). Cube
maps also will use array_size to indicate their 6 faces, but since all drivers
should just be fine by inferring this themselves from the fact it's a cube map
as they always used to nothing should break.

commit 621737a638d187d208712250fc19a91978fdea6b
Author: Roland Scheidegger <sroland@vmware.com>
Date: Wed Jun 16 17:47:38 2010 +0100

gallium: adapt code to interface changes

There are still usages of pipe_surface where pipe_resource should be used,
which should eventually be fixed.

commit 2d17f5efe166b2c3d51957c76294165ab30b8ae2
Author: Roland Scheidegger <sroland@vmware.com>
Date: Wed Jun 16 17:46:14 2010 +0100

gallium: more interface changes

In particular to enable usage of buffers in views, and ability to use a
different pipe_format in pipe_surface.
Get rid of layout and offset parameter in pipe_surface - the former was
not used in any (public) code anyway, and the latter should either be computed
on-demand or driver can use subclass of pipe_surface.
Also make create_surface() use a template to be more consistent with
other functions.

commit 71f885ee16aa5cf2742c44bfaf0dc5b8734b9901
Merge: 3232d11 8ad410d
Author: Roland Scheidegger <sroland@vmware.com>
Date: Mon Jun 14 14:19:51 2010 +0100

Merge commit 'origin/master' into gallium-array-textures

Conflicts:
src/gallium/auxiliary/util/u_box.h
src/gallium/drivers/nv50/nv50_surface.c
src/gallium/drivers/nvfx/nvfx_surface.c
src/gallium/drivers/r300/r300_blit.c
src/gallium/drivers/r300/r300_texture.c
src/gallium/drivers/r300/r300_transfer.c
src/gallium/drivers/r600/r600_blit.c
src/gallium/drivers/r600/r600_screen.h
src/gallium/include/pipe/p_state.h

commit 3232d11fe3ebf7686286013c357b404714853984
Author: Roland Scheidegger <sroland@vmware.com>
Date: Mon Jun 14 11:40:04 2010 +0100

mesa/st: adapt to interface changes

still need to fix pipe_surface sharing
(as that is now per-context).
Also broken is depth0 handling - half the code assumes
this is also used for array textures (and hence by extension
of that cube maps would have depth 6), half the code does not...

commit f433b7f7f552720e5eade0b4078db94590ee85e1
Author: Roland Scheidegger <sroland@vmware.com>
Date: Mon Jun 14 11:35:52 2010 +0100

gallium: fix a couple of bugs in interface chnage fixes

commit 818366b28ea18f514dc791646248ce6f08d9bbcf
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:42:11 2010 +0200

targets: adapt to interface changes

Yes even that needs adjustments...

commit 66c511ab1682c9918e0200902039247793acb41e
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:41:13 2010 +0200

tests: adapt to interface changes

Everything needs to be fixed :-(.

commit 6b494635d9dbdaa7605bc87b1ebf682b138c5808
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:39:50 2010 +0200

st: adapt non-rendering state trackers to interface changes

might not be quite right in all places, but they really don't want
to use pipe_surface.

commit 00c4289a35d86e4fe85919ec32aa9f5ffe69d16d
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:38:48 2010 +0200

winsys: adapt to interface changes

commit 39d858554dc9ed5dbc795626fec3ef9deae552a0
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:26:54 2010 +0200

st/python: adapt to interface changes

don't think that will work, sorry.

commit 6e9336bc49b32139cec4e683857d0958000e15e3
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:26:07 2010 +0200

st/vega: adapt to interface changes

commit e07f2ae9aaf8842757d5d50865f76f8276245e11
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:25:56 2010 +0200

st/xorg: adapt to interface changes

commit 05531c10a74a4358103e30d3b38a5eceb25c947f
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:24:53 2010 +0200

nv50: adapt to interface changes

commit 97704f388d7042121c6d496ba8c003afa3ea2bf3
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:24:45 2010 +0200

nvfx: adapt to interface changes

commit a8a9c93d703af6e8f5c12e1cea9ec665add1abe0
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:24:01 2010 +0200

i965g: adapt to interface changes

commit 0dde209589872d20cc34ed0b237e3ed7ae0e2de3
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:22:38 2010 +0200

i915g: adapt to interface changes

commit 5cac9beede69d12f5807ee1a247a4c864652799e
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:20:58 2010 +0200

svga: adapt to interface changes

resource_copy_region still looking fishy.
Was not very suited to unified zslice/face approach...

commit 08b5a6af4b963a3e4c75fc336bf6c0772dce5150
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:20:01 2010 +0200

rbug: adapt to interface changes

Not sure if that won't need changes elsewhere?

commit c9fd24b1f586bcef2e0a6e76b68e40fca3408964
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:19:31 2010 +0200

trace: adapt to interface changes

commit ed84e010afc5635a1a47390b32247a266f65b8d1
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:19:21 2010 +0200

failover: adapt to interface changes

commit a1d4b4a293da933276908e3393435ec4b43cf201
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:19:12 2010 +0200

identity: adapt to interface changes

commit a8dd73e2c56c7d95ffcf174408f38f4f35fd2f4c
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:18:55 2010 +0200

softpipe: adapt to interface changes

commit a886085893e461e8473978e8206ec2312b7077ff
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:18:44 2010 +0200

llvmpipe: adapt to interface changes

commit 70523f6d567d8b7cfda682157556370fd3c43460
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:18:14 2010 +0200

r600g: adapt to interface changes

commit 3f4bc72bd80994865eb9f6b8dfd11e2b97060d19
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:18:05 2010 +0200

r300g: adapt to interface changes

commit 5d353b55ee14db0ac0515b5a3cf9389430832c19
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:17:37 2010 +0200

cell: adapt to interface changes

not even compile tested

commit cf5d03601322c2dcb12d7a9c2f1745e2b2a35eb4
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:14:59 2010 +0200

util: adapt to interface changes

amazing how much code changes just due to some subtle interface changes?

commit dc98d713c6937c0e177fc2caf23020402cc7ea7b
Author: Roland Scheidegger <sroland@vmware.com>
Date: Sat Jun 12 02:12:40 2010 +0200

gallium: more interface fail, docs

this also changes flush_frontbuffer to use a pipe_resource instead of
a pipe_surface - pipe_surface is not meant to be (or at least no longer)
an abstraction for standalone 2d images which get passed around.
(This has also implications for the non-rendering state-trackers.)

commit 08436d27ddd59857c22827c609b692aa0c407b7b
Author: Roland Scheidegger <sroland@vmware.com>
Date: Thu Jun 10 17:42:52 2010 +0200

gallium: fix array texture interface changes bugs, docs

commit 4a4d927609b62b4d7fb9dffa35158afe282f277b
Author: Roland Scheidegger <sroland@vmware.com>
Date: Thu Jun 3 22:02:44 2010 +0200

gallium: interface changes for array textures and related cleanups

This patch introduces array textures to gallium (note they are not immediately
usable without the associated changes to the shader side).
Also, this abandons pipe_subresource in favor of using level and layer
parameters since the distinction between several faces (which was part of
pipe_subresource for cube textures) and several z slices (which were not part
of pipe_subresource but instead part of pipe_box where appropriate for 3d
textures) is gone at the resource level.
Textures, be it array, cube, or 3d, now use a "unified" set of parameters,
there is no distinction between array members, cube faces, or 3d zslices.
This is unlike d3d10, whose subresource index includes layer information for
array textures, but which considers all z slices of a 3d texture to be part
of the same subresource.
In contrast to d3d10, OpenGL though reuses old 2d and 3d function entry points
for 1d and 2d array textures, respectively, which also implies that for instance
it is possible to specify all layers of a 2d array texture at once (note that
this is not possible for cube maps, which use the 2d entry points, although
it is possible for cube map arrays, which aren't supported yet in gallium).
This should possibly make drivers a bit simpler, and also get rid of mutually
exclusive parameters in some functions (as z and face were exclusive), one
potential downside would be that 3d array textures could not easily be supported
without reverting this, but those are nowhere to be seen.

Also along with adjusting to new parameters, rename get_tex_surface /
tex_surface_destroy to create_surface / surface_destroy and move them from
screen to context, which reflects much better what those do (they are analogous
to create_sampler_view / sampler_view_destroy).

PIPE_CAP_ARRAY_TEXTURES is used to indicate if a driver supports all of this
functionality (that is, both sampling from array texture as well as use a range
of layers as a render target, with selecting the layer from the geometry shader).
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
ac8662c29dbf96b456d23308c1bc459eea63e36c 16-Mar-2010 Roland Scheidegger <sroland@vmware.com> st/xorg: fix up xorg state tracker to use cso changes

use cso_set_fragment_sampler_views instead of cso_set_sampler_textures
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
59d6f3eb4a4052ef764a9ba0589e64a5252feceb 12-Mar-2010 Michel Dänzer <daenzer@vmware.com> st/xorg: Remove flushes no longer necessary thanks to context transfers.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
9b346f83a7b672e913a7bb6a089d5dbd7fbdce06 28-Jan-2010 Roland Scheidegger <sroland@vmware.com> Merge commit 'origin/perrtblend'

Conflicts:
src/gallium/drivers/softpipe/sp_screen.c
src/gallium/include/pipe/p_defines.h
92676b9fe6356a8974830c47c0191d1ca57a0741 25-Jan-2010 Roland Scheidegger <sroland@vmware.com> xorg: adapt to blend changes
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
cd8614b0287dc5a69725ec4ee0208fad61f7789e 22-Jan-2010 Brian Paul <brianp@vmware.com> Merge branch 'mesa_7_7_branch'

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
efc08bddb7622e4acfa795b58e1264b64b78ab4f 22-Jan-2010 Vinson Lee <vlee@vmware.com> st/xorg: Remove unnecessary headers.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
06d3732a9094030fc33120f16f162e0d405f132c 01-Dec-2009 Keith Whitwell <keithw@vmware.com> Merge commit 'origin/mesa_7_7_branch'

Conflicts:
src/gallium/drivers/svga/svga_screen_texture.c
src/gallium/state_trackers/xorg/xorg_composite.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/mesa/main/texgetimage.c
src/mesa/main/version.h
c95cbd45c657ac47e908a4d99d118737034bde43 27-Nov-2009 Roland Scheidegger <sroland@vmware.com> Merge branch 'width0'

Conflicts:
src/gallium/drivers/r300/r300_texture.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/mesa/state_tracker/st_cb_texture.c
4236493899b9ccfcc8df3dcf81697776621fa1f8 27-Nov-2009 Keith Whitwell <keithw@vmware.com> st/xorg: proper fix for compositing after rounding up

Basically don't round up shared textures. This fixes compiz,
but I'm afraid that rounding up texture sizes here in the driver
is doomed, as it will inevitably break texture wrap modes.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
d509f84543d0979e9bb53c20c195f378dd61e728 26-Nov-2009 Roland Scheidegger <sroland@vmware.com> gallium: fix more statetrackers/drivers for not using texture width/height/depth arrays
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
ecfe1352ccce802c9299c76d600c4d2f33352701 26-Nov-2009 Keith Whitwell <keithw@vmware.com> st/xorg: fix refcounting bugs introduced in earlier commit
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
91a5131e6b4b9d55c7123d3a8334826a443abcf6 26-Nov-2009 Keith Whitwell <keithw@vmware.com> st/xorg: don't set up constant buffer for non-xv fragment shaders

These currently don't reference any constants. Can add this back
if newer shaders need them, but in the meantime don't create
a new constant buffer every time we do a blit.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
fa799f81dec1b72e59008b7029d94a00bcf821bb 26-Nov-2009 Keith Whitwell <keithw@vmware.com> st/xorg: split up shared Done call

The two users of composite (Composite and Solid) now call a new
xorg_composite_done() from their Done functions, while CopyDone
is directly implemented on top of xorg_renderer.c.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
b4ea1eb871ec0e5fffd70bf4da6cdec5d25b5c50 26-Nov-2009 Keith Whitwell <keithw@vmware.com> st/xorg: set up rasterizer state in init
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
7fbdbad5c02e3d5bfbf0e641e2aec224e39fa974 25-Nov-2009 Keith Whitwell <keithw@vmware.com> st/xorg: consolidate some dest surface state setting
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
c712f3374626d96f9c08c3571a5572bcee60a5f2 23-Nov-2009 Zack Rusin <zackr@vmware.com> st/xorg: accelerate src luminance
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
46feb7db71b05ec67a7c78f6bc608adec0734dec 22-Nov-2009 Vinson Lee <vlee@vmware.com> st/xorg: Reorder cases in switch statement.

Silences missing break statement warning.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
8d6da811d4fff50dc42e71c6149759908a458f7f 18-Nov-2009 Jakob Bornecrantz <jakob@vmware.com> st/xorg: Unbind any textures in solid

Helps debuging with rbug
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
08cb1d0ce4765536f1cb6a9253a2245c31fb8ea9 20-Nov-2009 Vinson Lee <vlee@vmware.com> st/xorg: Fix type of 'unknown'.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
012d0193cc9ad6fdc9829db0a6884a5a590dd4c5 19-Nov-2009 Michel Dänzer <daenzer@vmware.com> st/xorg: Don't complain about convolution filter being 'unknown'.

Also add a newline to the complaint so it'll be a little less annoying if we
actually encounter an unknown filter value again.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
648e8b4c46e9ab0374fdbe655321157125b7efe5 17-Nov-2009 Jakob Bornecrantz <jakob@vmware.com> st/xorg: Fix copy-pasto

Thanks Alan.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
cb060f3b987c9fa07ebe06cf2e7e54d1eaded1e1 16-Nov-2009 Jakob Bornecrantz <jakob@vmware.com> st/xorg: Fix comp alpha code and deal with luminance masks

There are two fixes in here one is a one liner that fixes
component alpha logic. The other deals better with luminance
formats used for masks, sources not yet implemented.

Fixes component alpha text and icons in gnome. There are a one
or two cases that this code misses. Like if src_luminance is set
but no mask image is given.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
5438ee3ecfe5c25102d196fd6d7258201e27e6ca 12-Nov-2009 Jakob Bornecrantz <jakob@vmware.com> st/xorg: Incase of format missmatch swizzle channels and set alpha

This path is only hit for icons in gnome so far
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
2cfbbc76e445d88bdac7dd4dd22aaf36bbc8e4cc 12-Nov-2009 Zack Rusin <zackr@vmware.com> st/xorg: implement repeatnone and make some code smell less like ass
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
493d599af4f617d52323e0368e65da29ba4638aa 12-Nov-2009 Zack Rusin <zackr@vmware.com> st/xorg: fallback until daddy can implement you properly
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
fca8b2c3ae53695f8ff6e823cc316aab910490e5 11-Nov-2009 Zack Rusin <zackr@vmware.com> st/xorg: wrap to border color
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
031fbb9681d6ddc3b515768a914496b2b550cfce 10-Nov-2009 Zack Rusin <zackr@vmware.com> st/xorg: remove deprecated rendering code
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
a6d527d7b82579feae9db20657d47a3f86115bb4 10-Nov-2009 Zack Rusin <zackr@vmware.com> st/xorg: fix composite batching

quite a large performance optimization (text demo from 1.6fps to 9fps)
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
e521bf7706a5527ad5750baef78feaa961f73ecc 06-Nov-2009 Zack Rusin <zackr@vmware.com> st/xorg: implement batching for the composite op

something is broken so disabled for now
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
4322346f3fd03788a79d056ca7bce2db25bc9d88 06-Nov-2009 Zack Rusin <zackr@vmware.com> st/xorg: batch solid fill requests

instead of lots of very small transfers, one larger is a lot better
for performance
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
4c5a758d064d1a8fca245d4ffeb2f80ba8c781e3 05-Nov-2009 Zack Rusin <zackr@vmware.com> st/xorg: these flushes shouldn't be necessary

performance optimization
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
b17c885a8aa88ef06f384330d59aeb23b73350bb 23-Oct-2009 Zack Rusin <zackr@vmware.com> st/xorg: fix text with component alpha rendering
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
bec5230a1ff3998d0f184fc2b7437b51082c329f 23-Oct-2009 Zack Rusin <zackr@vmware.com> st/xorg: lots of fixes related to compositing

fixes transformations, rendering with multiple bound textures, xrender
matrix conversions plus some cleanups
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
1f5b568fbeda9e48f0ea6473cf8193e9502bb21a 22-Oct-2009 Zack Rusin <zackr@vmware.com> st/xorg: cleanup the checks for whether the op is accelerated
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
c4af8ce69e1a7105b0178da8a085b73ab984e432 22-Oct-2009 Zack Rusin <zackr@vmware.com> st/xorg: lots of render fixes

fixes all the blend modes, fixes flushing/finishing semantics, adds
acceleration for the component alpha modes that we can support, fixes
src in mask shader and general cleanups
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
a39a3cc14e816cc91a81028a27c4dbd4816cdc9d 13-Oct-2009 Zack Rusin <zackr@vmware.com> st/xorg: implement basic src/mask transformations

plus fix filters
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
108273c5ed43b2c54a58900b7bb4528f912e2b1f 11-Oct-2009 Zack Rusin <zackr@vmware.com> st/xorg: refix source over
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
074e069910c7082620be4211fe5496365f828886 11-Oct-2009 Zack Rusin <zackr@vmware.com> st/xorg: fix most of the composition modes
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
59cf40059a7c451b1d1bc0c90f674e8e4baa5ab8 11-Oct-2009 Zack Rusin <zackr@vmware.com> st/xorg: get transparency on fills working (fixes Qt/KDE apps)
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
1cc1c3a0336d74e518417e2e93e141171a50542b 10-Oct-2009 Zack Rusin <zackr@vmware.com> st/xorg: solid fills with masks are supported

gradients are supported, but not enabled by default due to little
testing they got
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
89bb33fb20e69d9fa5325da10abf31d61d51d371 10-Oct-2009 Zack Rusin <zackr@vmware.com> st/xorg: fix and enable by default xrender acceleration

src in mask was broken
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
319a588238b4c0c58f8f8807e1143ad79cd8f698 09-Oct-2009 Zack Rusin <zackr@vmware.com> st/xorg: lots of rendering and xv changes

extract all the rendering code to xorg_rendedrer, make both exa and xv
share that code. in the process cleanup the rendering code and implement
a lot more of the xv infrastructure.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
6d629d4aa211d098fe9541d0b644cf67ee1d7019 08-Oct-2009 Jakob Bornecrantz <jakob@vmware.com> st/xorg: More fallback debugging

Change the fallback debugging around a bit and do the old commit correctly
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
e226bf8a5d1e916b6c99397987eea4f31ee5de3b 27-Sep-2009 Jakob Bornecrantz <wallbraker@gmail.com> st/xorg: Make debug printing optional
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
07e2d6edfac618729bc2321fd64e15f34360d5fa 25-Sep-2009 Michel Dänzer <daenzer@vmware.com> st/xorg: Flush render cache if but only if a source has pending write operations.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
626553f327394b835cecaf4795692028c2378efa 25-Sep-2009 Michel Dänzer <daenzer@vmware.com> st/xorg: Reject Composite acceleration for some cases not working yet.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
67fb13ba682951d3aa61efca25614cdde6bb70f2 25-Sep-2009 Michel Dänzer <daenzer@vmware.com> st/xorg: Bind rasterizer state for copies.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
7edda9350acbf84b63ad67af8053fb07785637cb 25-Sep-2009 Michel Dänzer <daenzer@vmware.com> st/xorg: Source-only pictures always have format PICT_a8r8g8b8.

See xserver/render/picture.c:createSourcePicture(). This both simplifies the
code and avoids a crash because pFormat is NULL.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
07f107467ed1e301b1362298c350ff3758a1f22f 25-Sep-2009 Michel Dänzer <daenzer@vmware.com> st/xorg: Better checks for unsupported component alpha pictures.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
80965fca743c3101af731080cb81dec705cd931b 23-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: fills are supported plussome minor clenups
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
53d2fa46e7fa19d0cb7dec74efcd407ab6163c80 23-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: add easier way of disabling/enabling acceleration
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
5a7f7085303c1337466e231f8fb12b9c4113f4ad 22-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: keep the user buffer contents around

Michel noticed that they were getting out of scope
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
bade906ed131e35ed1782f4687760dcdca233299 22-Sep-2009 Jakob Bornecrantz <wallbraker@gmail.com> st/xorg: Fix two leeks

We where leaking both surfaces in the composit code
and textures from pixmaps.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
a016043386045d7cc35d70e42d963704fcae3731 15-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: fixing copies and composite shaders

copies were busted when src == dst. also the composite shaders
were incorrectly using the fragments instead of the texture coordinate.
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
8adcad0c703a9d339b6630ceaba5f96981c524d9 15-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: lots of fixes

fixes blending binding and copy coordinates
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
ef7746217176ba251dc6a5deb90c308c9964ed7b 15-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: add some debugging helpers
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
8c37a4c8fd133f3cddc6798a0834038730acc213 09-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: rename ctx to pipe to match every other gallium state tracker

plus it avoids the "ctx->ctx->" syntax
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
feb74e7753f56c0fa3ec943a45bbf48f2183e04c 09-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: implement pipelines surface/texture copies
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
57d0934bc562c7a0de0c79fb0263ab3569eed002 09-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: unite finalization and stub out pipelined copies
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
16886c8be34fd17ed34c83ed2e83af2c825c989d 09-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: disable solid fills until copies are accelerated as well
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
6be1a98ab9d64584c3852b97e2f1d63697f7bf76 09-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: implement exasolids with full pipelining

plus fix some small issues with the shaders
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
3167c2e8a0a248c290ae8bfff23c88db8f39cd11 09-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: start adding support for surface fills
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
07f9ad5c322ce409fdd4b86e3913f7cc085520b5 03-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: adjust enums in preperation for gradients
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
d6b58a97c2f94ca54852414103c4ac2832279f2f 03-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: handle xrender repeat modes
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
dc9de8064f52b12d29d9ecd51b765973ac293fac 02-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: flip the coordinate system
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
a8cbb1563213086f58d3b82b6d0755a59eb43c79 01-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: setup solid fills
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
811aa02c7a0f4804189a8978395f07d27fb726ec 01-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: fold back the helper function into core
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
91c366359ce0bf5f450fd1d774b771c95ed2f651 01-Sep-2009 Zack Rusin <zackr@vmware.com> st/xorg: start rendering and compositing pictures
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
f315c0128b5f6317f910f6c54119fea97256254c 28-Aug-2009 Zack Rusin <zackr@vmware.com> st/xorg: add code to render textured quads for composite acceleration
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
9ccbadb22d74c649a634c515cd1123fe96781357 28-Aug-2009 Zack Rusin <zackr@vmware.com> st/xorg: setup constant buffers for vertex and fragment shaders
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
aaedd035ca90d20efdc75a4123c99baaf8d20dc9 28-Aug-2009 Zack Rusin <zackr@vmware.com> st/xorg: disable composite accelration for now
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
0a2681128622b0c0a22b68c95309cc70a237cc5c 28-Aug-2009 Zack Rusin <zackr@vmware.com> st/xorg: bind samplers before composition
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
f1c0a4b2f4b0054a3371fcaf5121bf53ef29b756 28-Aug-2009 Zack Rusin <zackr@vmware.com> st/xorg: normalize coords for the src operands in the vertex shader
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
8bdce0c3a7b3e3798de736ef4ce72431d777901c 28-Aug-2009 Zack Rusin <zackr@vmware.com> st/xorg: set vertex and fragment shader for the current op
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
c7e103d2388ea53348c9537adf40c643f80e76dc 28-Aug-2009 Zack Rusin <zackr@vmware.com> st/xorg: bind rasterizer state
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
2048182e868a759c3198b3cbaf2dd1d366fe0a21 28-Aug-2009 Zack Rusin <zackr@vmware.com> st/xorg: set blend state for exa
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
f9a3fce09044fbfe9a9b973d33b31cfe826d1386 27-Aug-2009 Zack Rusin <zackr@vmware.com> st/xorg: bind framebuffer and viewport for exa
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
c7653a83330e5ea63ad3a566da15155e216c6cb4 25-Aug-2009 Zack Rusin <zackr@vmware.com> exa: check whether the op is accelerated
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
17076d700c94402f82c22b2e1d99a1753e4a0834 25-Aug-2009 Zack Rusin <zackr@vmware.com> xorg: start on code accelerating render
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c
21cce6afb03bf9b9adfc6d8a1a446bb3ef22c7a8 08-Jun-2009 Zack Rusin <zack@kde.org> exa: some infrastucture work for accelerating composite
/external/mesa3d/src/gallium/state_trackers/xorg/xorg_composite.c