| 7ca75b62cdd9ddc943ded3a6904b11f62162affb |
|
11-Nov-2012 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: fix computation of last_level during texture creation
Array textures were broken.
NOTE: This is a candidate for the stable branches.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit 6dd839f23a8ee7b6853f7320a2715df44040b358)
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| d1dfe4e020e563606e7d987968682501829800db |
|
11-Nov-2012 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: fix guessing the base level size
It was pretty broken with array textures, where the array size (height or
depth depending on the target) shouldn't be magnified.
The guessing also doesn't fail with 1D and cube textures.
NOTE: This is a candidate for the stable branches.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit c06258dd0297e1fe7910f48a59aa0de79029ce39)
Conflicts:
src/mesa/state_tracker/st_cb_texture.c
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 8e019506257b720a1a6ff668aef57bff445a1725 |
|
22-Oct-2012 |
Michel Dänzer <michel.daenzer@amd.com> |
st/mesa: Fix assertions for copying texture image to finalized miptree.
The layer dimension of array textures is not subject to mipmap minification.
OTOH we were missing an assertion for the depth dimension.
Fixes assertion failures with piglit {f,v}s-textureSize-sampler1DArrayShadow.
For some reason, they only resulted in piglit 'warn' results for me, not
failures.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56211
NOTE: This is a candidate for the stable branches.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Tested-by: Andreas Boll <andreas.boll.dev@gmail.com>
(cherry picked from commit eee1ff423c6a0c9c776b4e76b79bb5ed5480d83c)
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 8f772b34b0d59e369177c129a1d195917b288adf |
|
19-Oct-2012 |
Michel Dänzer <michel.daenzer@amd.com> |
st/mesa: Fix source miptree level for copying data to finalized miptree.
Fixes WebGL texture mips conformance test, no piglit regressions.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=44912
NOTE: This is a candidate for the stable branches.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Tested-by: Andreas Boll <andreas.boll.dev@gmail.com>
(cherry picked from commit c2e37b1d2e1b8014475c7d2698fba317c9082d70)
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a971476cc7913edde1944f33f164cd507199e1dd |
|
27-Aug-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: use fallback path for glCopyTexSubImage(GL_TEXTURE_1D_ARRAY)
Fixes many failing cases in piglit copyteximage test.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 46751edca9a95baff81771aa69986fa6e2422ed6 |
|
22-Aug-2012 |
Brian Paul <brianp@vmware.com> |
mesa: new _mesa_num_tex_faces() helper
Not a real big help now, but will be useful for the
GL_ARB_texture_cube_map_array extension in the future.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5606bd574e264c4beda8eb1d10b48d17e9b8b497 |
|
12-Jun-2012 |
Pauli Nieminen <pauli.nieminen@linux.intel.com> |
mesa: Remove unnecessary parameters CompressedTexImage
In tune with previous patches. Again there is duplication of information
in function parameters that is good to remove.
Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c9a7dfcf92e6adb4b85338c2c8dbbfbaf39fbfe7 |
|
12-Jun-2012 |
Pauli Nieminen <pauli.nieminen@linux.intel.com> |
mesa: Remove unnecessary parameters from AllocTextureImageBuffer
Size and format information is always stored in gl_texture_image
structure. That makes it preferable to remove duplicate information from
parameters to make interface easier to understand.
Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c5af8891805fc4f590c1371c098cdbc704c44e00 |
|
12-Jun-2012 |
Pauli Nieminen <pauli.nieminen@linux.intel.com> |
mesa: Remove unnecessary parameters from TexImage
gl_texture_image structure always holds size and internal format before
TexImage driver hook is called. Those passing same information in
function parameters only duplicates information making the interface
harder to understand.
Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 9b04abe36812a34ba447e5b1f8d8e44a10510820 |
|
10-Aug-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix glCopyTexSubImage crash
Fixes a WebGL crash. The dest texture image is at level 2 and is of
size 1x1 texel. The st texture image is a stand-alone resource, not
a pointer into a complete mipmap. So the resource has one level and
trying to write to level 2 blows up.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=53314
and http://bugs.freedesktop.org/show_bug.cgi?id=53319
Note: This is a candidate for the 8.0 branch.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5ba15d8d38d98cb7b625fa55e7d818ef9c6629ce |
|
09-Jul-2012 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: implement accelerated stencil blitting using shader stencil export
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 24e0a2633512afa3208969520b9e29a8b974275d |
|
09-Jul-2012 |
Marek Olšák <maraeo@gmail.com> |
gallium/u_blit: drop not-very-useful wrapper around util_blit_pixels_writemask
just rename it to util_blit_pixels
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5e7e7d96b341e937d3b795e94ac4a863c357f724 |
|
15-Jun-2012 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: don't do srgb->linear conversion in decompress_with_blit
This fixes piglit/getteximage-formats on r600g.
NOTE: This is a candidate for stable branches.
Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| ec19bdd16c3d4070af69fd865042babe0a627595 |
|
06-Jun-2012 |
Brian Paul <brianp@vmware.com> |
mesa: consolidate internal glCompressedTexSubImage1/2/3D code
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| e8fdd0e0d5286f4a9c763ffde44decec51124ebc |
|
06-Jun-2012 |
Brian Paul <brianp@vmware.com> |
mesa: consolidate internal glCompressedTexImage1/2/3D code
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| cd9ab2584f5e2a5eb0e96a948e6aedc9a33c886d |
|
06-Jun-2012 |
Brian Paul <brianp@vmware.com> |
mesa: consolidate internal glCopyTexSubImage1/2/3D code
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| e42d00b3f4503a0840575c8e5f4517a66c8af613 |
|
06-Jun-2012 |
Brian Paul <brianp@vmware.com> |
mesa: consolidate internal glTexSubImage1/2/3D code
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 8f5fffe75d2f8ae7c7ee706b53379a25bc673ae4 |
|
06-Jun-2012 |
Brian Paul <brianp@vmware.com> |
mesa: consolidate internal glTexImage1/2/3D code
The functions for handling 1D, 2D and 3D texture images were nearly
identical. This folds them all together.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c91b4edff978ee19afb4fe38ad69efc52db90691 |
|
23-May-2012 |
Vadim Girlin <vadimgirlin@gmail.com> |
st/mesa: set stObj->lastLevel in guess_and_alloc_texture
Fixes lockups/asserts with depthstencil-render-miplevels tests and r600g.
Should also fix https://bugs.freedesktop.org/show_bug.cgi?id=50033
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f4a93e0665881dd58a95abb6525676bd1cc2e6af |
|
17-Mar-2012 |
Brian Paul <brianp@vmware.com> |
mesa: rework texture completeness testing
Instead of gl_texture_object::_Complete there are now two fields:
_BaseComplete and _MipmapComplete. The former indicates whether the base
texture level is valid. The later indicates whether the whole mipmap is
valid.
With sampler objects, a single texture can appear to be both complete and
incomplete at the same time. See the GL_ARB_sampler_objects spec for more
details. To implement this we now check if the texture is complete with
respect to a sampler state.
Another benefit of this is we no longer need to invalidate a texture's
completeness state when we change the minification/magnification filters
with glTexParameter().
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 3e88e432244336518e1bbcf303ee53eae4df2a02 |
|
20-Feb-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: stop using MAX_WIDTH in st_cb_texture.c
Reviewed-by: José Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 6835103878afd27a1d66d29d16cbfb0b1e894a94 |
|
03-Feb-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: use pipe_sampler_view_release()
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c9d0526084e87799f11bdb7322f257b88f1033c4 |
|
14-Feb-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: use _mesa_format_matches_format_and_type() in decompress_with_blit()
st_equal_formats() is no longer used now.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 0315cb9f8f3ec38fa9594860754fb53a67cf4c23 |
|
13-Feb-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: use private pipe_sampler_view in decompress_with_blit()
Similar to the previous commit. Also fix incorrect setting of the
sampler view's state after it's created. We need to specify the
first/last_level fields in the template instead.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| ea2aca036c742474cda03e3b7012b188a14d0287 |
|
13-Feb-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove st_get_default_texture()
Just use _mesa_get_fallback_texture() instead.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 84c7c14697c82fe25586f8186b4f47d80a6f05f9 |
|
17-Jan-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: pass GL_MAP_INVALIDATE_RANGE_BIT to gallium drivers
when mapping renderbuffers or texture images.
NOTE: This is a candidate for the 8.0 branch.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 56b57aa360a8bad0c4b68fbdf7c64ac33f9e7661 |
|
29-Dec-2011 |
Brian Paul <brianp@vmware.com> |
mesa: rework ctx->Driver.CopyTexSubImage() parameters
Replace target, level parameters with gl_texture_image.
Add gl_renderbuffer parameter to indicate source buffer for the copy.
This removes some redundant code in the drivers to find the source
renderbuffer and the destination texture image (which we already had
in _mesa_CopyTexSubImage).
Signed-off-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a61e164ae09cc2aec5df483809a2c6d74e36bf99 |
|
04-Jan-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: 80-column wrapping
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 2a0c515b8960a3227c3e64c84a3014823da276a3 |
|
04-Jan-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove st_CompressedTexSubImage1D/2D/3D()
Just use the core Mesa functions instead.
Signed-off-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 29725470478ecc8efa9f74fd9f7bee33d34058df |
|
04-Jan-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix indentation in st_copy_texsubimage()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5d67d4fbebb7c7d6582c4c92fc5cea4a8e6a60ab |
|
04-Jan-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove st_TexImage(), use core Mesa code instead
The core Mesa code does the equivalent memory allocation, image mapping,
storing and unmapping. We just need to call prep_teximage() first to
handle the 'surface_based' stuff.
The other change is to always use the level=0 mipmap image when accessing
individual mipmap level images that are stored in resources/buffers.
Apparently, we were always using malloc'd memory for individual mipmap
images, not resource buffers, before.
Signed-off-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 19840c46f38b7bfe04bfaa925a6f56b3777be6ff |
|
04-Jan-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: refactor gl_TexImage() code into prep_teximage()
Preparation for st_TexImage() removal/refactoring.
Signed-off-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 892a2542a3f0753a7064c710b96f077dd5490624 |
|
04-Jan-2012 |
Brian Paul <brianp@vmware.com> |
mesa: remove unused _mesa_init_teximage_fields() target parameter
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| d69d287068e0a6b5e2f3c13b1f55335a9b6ce03b |
|
02-Jan-2012 |
Brian Paul <brianp@vmware.com> |
mesa: remove the dstX/Y/Zoffset params to _mesa_texstore() functions
The were always zero. When doing a sub-texture replacement we account
for the dstX/Y/Zoffsets when we map the texture image. So no need to
pass them into the texstore code anymore.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 99fbf7ce341c346631d11395c792a0589c5035dd |
|
31-Dec-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove stImage->base.Face/Level assignments in st_TexImage()
This fixes a regresssion (broken cube maps) caused by the
ctx->Driver.TexImage parameter simplification commit. The target var
is always GL_TEXTURE_CUBE_MAP at this point so the Face field was always
getting set to zero.
These field assignments aren't needed anyway since core Mesa sets them.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 94a0c518dc90a24cb4c44ce0a5e6abeba57cbb08 |
|
30-Dec-2011 |
Brian Paul <brianp@vmware.com> |
mesa: simplify Driver.CompressedTex[Sub]Image function parameters
As with previous commits, the target, level and texObj info can be
obtained through the texImage pointer.
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 92c64624cd7533cde466dbec8722f7f72f275fd8 |
|
30-Dec-2011 |
Brian Paul <brianp@vmware.com> |
mesa: simplify Driver.TexImage() parameters
As with TexSubImage(), the target, level and texObj values can be obtained
through the texImage pointer.
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c22a95c4f2db64c61cb25f37acc38254f30850f1 |
|
30-Dec-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove TexSubImage code, use core mesa routines instead.
Since the move to Map/UnmapTextureImage, the core mesa routines are
equivalent to what the state tracker was doing.
The TexImage functions can be replaced too, but there's a few differences
that will need to be handled.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 02d12719e356ee9e3348db67ae55ae790dad058f |
|
10-Dec-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: stop using _DepthBuffer, _StencilBuffer fields
We never want to use the depth/stencil buffer wrappers so always just
use the attachment renderbuffers. This is a step toward removing the
_DepthBuffer, _StencilBuffer fields.
Reviewed-by: Eric Anholt <eric@anholt.net>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5acb291f319a0b32d9701b3e6c8624175f1a80e7 |
|
03-Dec-2011 |
Brian Paul <brianp@vmware.com> |
mesa: remove TextureMemCpy driver hook
There's probably no reason to use a special version of memcpy() anymore.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| d9582026631ae3cd667f6cd13040b93e42db3e44 |
|
03-Dec-2011 |
Henri Verbeet <hverbeet@gmail.com> |
st/mesa: Use util_blit_pixels_writemask() for depth blits as well in st_copy_texsubimage().
This has no piglit regressions on r600g and softpipe.
Signed-off-by: Henri Verbeet <hverbeet@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 8cd0873d319cefce74164147c9855e81f051d1e1 |
|
22-Oct-2011 |
Chia-I Wu <olv@lunarg.com> |
st/mesa: add support for GL_OES_EGL_image_external
To pipe drivers, external textures are just 2D textures.
Reviewed-by: Brian Paul <brianp@vmware.com>
Acked-by: Jakob Bornecrantz <jakob@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| e0a0496971dfd6c0f22b3870e6320128fa895d4d |
|
31-Oct-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: implement GL_ARB_texture_storage
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 9c4b02528752eb6392009e41025202fc9f9ca5b3 |
|
17-Oct-2011 |
Eric Anholt <eric@anholt.net> |
mesa: Fold gallium's texture border stripping into a core Mesa option.
We wanted to reuse this in the Intel driver.
v2: Move the flag to ctx->Const
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (v1)
Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 068fcc029d58f97a7bdbaa01fdbafacbb37e9d68 |
|
06-Oct-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix comment
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| cf2439e2463ce925e3e256a25a505cf0586963f0 |
|
06-Oct-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: don't use gl_texture_image::RowStride
It's always the same as the texture width.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| aff65241c8bf6206c6dfcbe774b87991f965d46f |
|
05-Oct-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: completely stop using gl_texture_image::Data
Instead, use the new st_texture_image::TexData field to hold texture
images that don't fit the parent object's mipmap buffer.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 85f5aa156562168d2ecea140b4e087655b11d271 |
|
05-Oct-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: stop using gl_texture_image::Data when mapping/unmapping textures
Since core Mesa no longer depends on gl_texture_image::Data pointing to
mapped texture buffers we don't have to mess with it all over the place
in the state tracker. Now Data is only used to point to malloc'd memory
that holds images which don't fit in the texture object's mipmap buffer.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5253cf98057dad54e25b4b8c36f8cf24f559314c |
|
05-Oct-2011 |
Brian Paul <brianp@vmware.com> |
mesa: get rid of imageOffsets arrays in texstore code
These were used to find the start of a 3D image slice (or 2D array texture
slice) given a base address. Instead, use a simple array of address of
image slices instead.
This is a step toward getting rid of the gl_texture_image::ImageOffsets
field.
Reviewed-by: Eric Anholt <eric@anholt.net>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4e6bb0774ffa93141a3a8ec7bb47b190810b2a4b |
|
30-Sep-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: implement AllocTextureImageBuffer() driver hook
This hasn't been needed so far since none of the core Mesa code paths
that call ctx->Driver.AllocTextureImageBuffer() are used with the
state tracker. That will change in upcoming patches.
Note that this function duplicates some code seen in the st_TexImage()
function. That can be cleaned up later.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4368a657670f1f3f13d8497f749cb5439f91529e |
|
30-Sep-2011 |
Brian Paul <brianp@vmware.com> |
mesa: simplify parameters to GetTexImage() driver hook
The target, level and texObj can be obtained through the texImage
parameter. We could make similar changes for the TexImage() hooks too.
Reviewed-by: Eric Anholt <eric@anholt.net>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 1a867385d56022e904ef0235cbed545057fcb998 |
|
29-Sep-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove some old GetTexImage() code
We can use the core Mesa code for glGetTexImage() since it handles the
image mapping/unmapping now. We'll keep the decompress_with_blit() path
in the hope that it's faster than core Mesa's software decompression code.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=41312
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 124fc96ddf2695b4eca1a9b373f33cb993de9f6a |
|
28-Sep-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: substitute argument to guess_base_level_size() call
stObj->base.BaseLevel and firstImage->base.Level have the same value
but the later looks more consistent in the function call.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| ce62473408f884c876ee535f5f48cfe70dacb1ef |
|
01-Aug-2011 |
Brian Paul <brianp@vmware.com> |
mesa: Finally, convert RGBA glGetTexImage() to using MapTextureImage().
v2: Changes by Brian to MapTexImage in the decompression path.
v3: Changes by anholt to fix srcRowStride for decompression of NPOT.
Tested-by: Brian Paul <brianp@vmware.com> (v2)
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 429b45e7c0001c0979e0d0fd20c3821c166da4a9 |
|
01-Aug-2011 |
Brian Paul <brianp@vmware.com> |
mesa: Convert depth glGetTexImage() to using MapTextureImage().
Tested-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 59348722b7a2a9ec689af0613fa8435f78a90cc4 |
|
01-Aug-2011 |
Brian Paul <brianp@vmware.com> |
mesa: Convert depth/stencil glGetTexImage() to using MapTextureImage().
Note that the implementation before and after appears to be broken in
its handling of Z24_S8 vs S8_Z24.
Tested-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 8df7ca71125ee0ad74260378ff7e185dcf66f3bc |
|
30-Jul-2011 |
Brian Paul <brianp@vmware.com> |
mesa: Convert GetCompressedTexImage to using MapTextureImage().
This changes drivers to not map the texture on their own before
calling _mesa_get_compressed_teximage().
Tested-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 7276ab2c3664a3460cc8b0de7545c0abc819c7e9 |
|
23-Sep-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove unnecessary st_texture_match_image() parameters
We didn't use the face parameter and the level parameter can be found
in the gl_texture_image.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 20b92c9d1ed8802cf0acb1c24884d0cef2bce10e |
|
17-Sep-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: specify source mipmap level in decompress_with_blit()
This, along with the previous patch, fixes glGetTexImage() of compressed
textures for level > 0.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 146f536b3332b7a2022bb4ba5e2d1d2ec4bedd98 |
|
17-Sep-2011 |
Brian Paul <brianp@vmware.com> |
mesa: add new DeleteTextureImage() driver hook
Matches the NewTextureImage() hook. With new subclasses of
gl_texture_image coming we need a new hook to properly delete objects of
those subclasses.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| ce82914f5ad4bb9148370826099925590e9798fd |
|
17-Sep-2011 |
Brian Paul <brianp@vmware.com> |
mesa: move _mesa_update_fetch_functions() calls into swrast
Do it during swrast state validation since the FetchTexel() functions
are only called from swrast now and not core Mesa.
Remove assertions in mipmap.c since they're no longer appropriate.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| b0524e49fc555ec8e5505e88c03e1993cdf3666b |
|
15-Sep-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: rewrap a long line
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 0abb2659dda3ac7828cade6f9a999c511e33e905 |
|
30-Jul-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: Add implementation of MapTextureImage.
Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5401590815b0ef095e7881bbabce233bab07c1e6 |
|
27-Jul-2011 |
Eric Anholt <eric@anholt.net> |
Rename some driver FreeTextureImageData functions to FreeTextureImageBuffer.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 0bb29949ba8a9e5a15dc0640dbb0a4e7990a1d57 |
|
27-Jul-2011 |
Eric Anholt <eric@anholt.net> |
mesa: Rename FreeTexImageData to FreeTextureImageBuffer.
This was produced by sed, except for one hunk in driverfuncs.c where
trailing whitespace was dropped.
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 6dbad425bc423eb7db7c99aab161955c7b4cdc4c |
|
15-Jul-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove st_texture_image::face,level fields
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| d5e32397762a3bd55fa69ad6332351512083f9c6 |
|
20-Jul-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: get rid of redundant clipping code in st_copy_texsubimage()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 0823ef84a5c3a6332ea76d0001febf6aaa440dc3 |
|
20-Jul-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove st_CopyTexImage1D/2D()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 19789e403ca3d0171d18f3c862738225902315e9 |
|
27-Jun-2011 |
Andre Maasikas <amaasikas@gmail.com> |
st/mesa: fix overwriting gl_format with pipe_format since 9d380f48
fixes assert later on in texcompress2/r600g
Signed-off-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 09e71cf7228232aa203915c9248c79cf26c5b917 |
|
24-Jun-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix pipe_get_transfer() call in fallback_copy_texsubimage()
Commit 1a339b6c71ebab6e1a64f05b2e133022d3bbcd15 caused us to take
a different path through the glCopyTexSubImage() code. The
pipe_get_transfer() call neglected to pass the texture's level, face
and slice info. So we were always transferring from the 0th mipmap
level even when the source renderbuffer was a non-zero mipmap level
in a texture.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=38649
NOTE: This is a candidate for the 7.10 branch.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 8d45bbc4221d83bc2bfd0295f56b0f6d35b16a99 |
|
29-May-2011 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: conditional rendering should not kill texture decompression via blit
NOTE: This is a candidate for the 7.10 branch.
Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 91e56c88972448079b5aafbc2b876d0ea0e28a39 |
|
29-May-2011 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: CopyTex(Sub)Image should not be killed by conditional rendering
NOTE: This is a candidate for the 7.10 branch.
Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 3e06803c2c6cf83009708b23d3ebafc0ea3dc525 |
|
26-May-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: simplify some st_context(ctx)->pipe code
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 863eecd0d892e9e7e01c6bb91f1937a450865bea |
|
24-Apr-2011 |
Dave Airlie <airlied@redhat.com> |
st/mesa: fix regression since a22aba4eae9b29db731487bce90e8292f7e82c72
"st/mesa: check image size before copy_image_data_to_texture()" caused
a regression in piglit fbo-generatemipmap-formats test on all gallium drivers.
Level 0 for NPOT textures will not match minified values, so don't do this
check for level 0.
Signed-off-by: Dave Airlie <airlied@redhat.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a22aba4eae9b29db731487bce90e8292f7e82c72 |
|
21-Apr-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: check image size before copy_image_data_to_texture()
We should only copy images into the dest texture if the size is correct.
This fixes a failed assertion when finalizing a texture with mis-defined
mipmap levels such as:
level 0: 32x32
level 1: 8x8
Also, fix incorrect mipmap level used in assertion at the top of
copy_image_data_to_texture().
NOTE: This is a candidate for the 7.10 branch.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 6881cfc7f7b425f52ae631936cc53d409f208fa1 |
|
14-Apr-2011 |
José Fonseca <jfonseca@vmware.com> |
mesa/st: Avoid spurious transfers when creating fbo textures without image data.
We could actually try to do an early return both for gallium textures and
malloc memory textures, but I'm not sure exactly which situations
stImage->pt is NULL, and whether texImage->Data == NULL would be acceptible
or not.
Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| ecfaab88b2577bd0395bc05d75a036126806a9c4 |
|
10-Apr-2011 |
Brian Paul <brianp@vmware.com> |
mesa: move sampler state into new gl_sampler_object type
gl_texture_object contains an instance of this type for the regular
texture object sampling state. glGenSamplers() generates new instances
of gl_sampler_object which can override that state with glBindSampler().
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 874a2c0b7da62f4dd08dedcec221f55b22e40e95 |
|
06-Apr-2011 |
Brian Paul <brianp@vmware.com> |
mesa: core support for GL_ARB_texture_buffer_object
No GLSL or driver support yet.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| ab21147c899ba1506df38438b6750d3dc5eaabdf |
|
12-Mar-2011 |
Henri Verbeet <hverbeet@gmail.com> |
u_blitter: Do blits in linear color space.
Blits between sRGB and linear formats should happen in linear color space.
This fixes piglit fbo/fbo-srgb-blit.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| e968975cb57eb854769292f7c6ff773c64a386c3 |
|
08-Mar-2011 |
Marek Olšák <maraeo@gmail.com> |
gallium: remove the geom_flags param from is_format_supported
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| ba48811fa8cbe80c67cdbbb9b8180aaf64433c4e |
|
04-Mar-2011 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: set PIPE_BIND_RENDER_TARGET for sRGB formats if UNORM is supported
Because the format can be changed to UNORM in a surface.
This fixes:
state_tracker/st_atom_framebuffer.c:163:update_framebuffer_state:
Assertion `framebuffer->cbufs[i]->texture->bind & (1 << 1)' failed.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| b70610b9823fc7dc3672735c11be1a75fbb1a2a4 |
|
01-Mar-2011 |
Brian Paul <brianp@vmware.com> |
mesa: move PBO-related functions into a new file
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 13f5a4d3169be75136ee5255474df803a8f4e070 |
|
18-Feb-2011 |
Dave Airlie <airlied@redhat.com> |
st/mesa: treat 1D ARRAY upload like a depth or 2D array upload.
This is because the HW doesn't always store a 1D array like a
2D texture, it more likely stores it like 2D texture (i.e.
alignments etc).
This means we upload each slice separately and let the driver
work out where to put it.
this might break nvc0 as I can't test it, I have only nv50 here.
Signed-off-by: Dave Airlie <airlied@redhat.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 7dbafea860dace9bfad29760f8b756122bc9937a |
|
21-Feb-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix incorrect texture size allocation in st_finalize_texture()
If finalizing a non-POW mipmapped texture with an odd-sized base texture
image we were allocating the wrong size of gallium texture (off by one).
Need to be more careful about computing the base texture image size.
This fixes https://bugs.freedesktop.org/show_bug.cgi?id=34463
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4cdcec08d14a0709b09dc82a35367b2bcc817957 |
|
21-Feb-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: refactor guess_and_alloc_texture() code
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f9df46f873ba3db15baaf77da9ee4dd98cb5f762 |
|
17-Feb-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove unused screen variables
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 2a2b156ea5ec40110b9e66ba9ccc7d6f3a314723 |
|
21-Sep-2010 |
José Fonseca <jfonseca@vmware.com> |
mesa: Remove the DXT compression via blit path.
No longer used.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 1dd8e2757852682af44b63193c89dff3c09c7703 |
|
29-Jan-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix texture array dimensions
For 1D/2D texture arrays use the pipe_resource::array_size field.
In OpenGL 1D arrays texture use the height dimension as the array
size and 2D array textures use the depth dimension as the array size.
Gallium uses a special array_size field instead. When setting up
gallium textures or comparing Mesa textures to gallium textures we
need to be extra careful that we're comparing the right fields.
The new st_gl_texture_dims_to_pipe_dims() function maps OpenGL
texture dimensions to gallium texture dimensions and simplifies
this quite a bit.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| db3a8af7f900e4970ea18659e86a824b4ebdefc7 |
|
29-Jan-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: pass layers param to st_texture_create()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 9b56a2cb626b254bcb7b7202e6babd1b5570208f |
|
26-Jan-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: support for 1D/2D texture arrays
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 9d380f487a4f2628594821a4fed5fe587ce52031 |
|
23-Jan-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: ensure that all pixel paths operation on linear RGB data, not sRGB
Before, we were converting between linear/sRGB in glReadPixels,
glDrawPixels, glAccum, etc if the renderbuffer was an sRGB texture.
Those all need to operate on pixel values as-is without conversion.
Also, when setting up render-to-texture, if the texture is sRGB the
pipe_surface view must be linear RGB. This will change when we
support GL_ARB_framebuffer_sRGB.
This fixes http://bugs.freedesktop.org/show_bug.cgi?id=33353
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 71b889f904fcba4fbc5aafff4cb62a7201f38075 |
|
06-Jan-2011 |
Fredrik Höglund <fredrik@kde.org> |
st/mesa: fix a regression from cae2bb76
stObj->pt is null when a TFP texture is passed to st_finalize_texture,
and with the changes introduced in the above commit this resulted in a
new texture being created and the existing image being copied into it.
NOTE: This is a candidate for the 7.10 branch.
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 59051ad44310d7f744fcb0706326564990b554dd |
|
22-Dec-2010 |
Henri Verbeet <hverbeet@gmail.com> |
st/mesa: Handle wrapped depth buffers in st_copy_texsubimage().
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| cae2bb76c1147d48f75ddd7a058a48d11e72ba03 |
|
06-Dec-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix mipmap generation bug
In st_finalize_texture() we were looking at the st_texture_object::
lastLevel field instead of the pipe_resource::last_level field to
determine which resource to store the mipmap in.
Then, in st_generate_mipmap() we need to call st_finalize_texture() to
make sure the destination resource is properly allocated.
These changes fix the broken piglit fbo-generatemipmap-formats test.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.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/mesa/state_tracker/st_cb_texture.c
|
| 83e93b6008213ad86607027e8434ecaccc8b1a2c |
|
19-Nov-2010 |
Brian Paul <brianp@vmware.com> |
mesa: pass gl_format to _mesa_init_teximage_fields()
This should prevent the field going unset in the future. See bug
http://bugs.freedesktop.org/show_bug.cgi?id=31544 for background.
Also remove unneeded calls to clear_teximage_fields().
Finally, call _mesa_set_fetch_functions() from the
_mesa_init_teximage_fields() function so callers have one less
thing to worry about.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 1c131752c3e07ef91f49d4970dafca6d26585334 |
|
23-Oct-2010 |
Brian Paul <brianp@vmware.com> |
mesa: split up the image.c file
New files:
pack.c - image/row packing/unpacking functions
pixeltransfer.c - pixel scale/bias/lookup functions
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f9995b30756140724f41daf963fa06167912be7f |
|
12-Oct-2010 |
Kristian Høgsberg <krh@bitplanet.net> |
Drop GLcontext typedef and use struct gl_context instead
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 8b2d5f431f8c862374d3e352f228b016060cd70a |
|
20-Sep-2010 |
Ian Romanick <ian.d.romanick@intel.com> |
Remove unnescessary initializations of UpdateTexturePalette
This is already NULL'ed in _mesa_init_driver_functions.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a62efdf82c20747feb11dfd7756f0579aa914b57 |
|
10-Sep-2010 |
Eric Anholt <eric@anholt.net> |
mesa: Remove EXT_convolution.
More optional code.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 907a6734fcd427a6ac6fe5fcfbeac5d6054d82ae |
|
10-Sep-2010 |
Eric Anholt <eric@anholt.net> |
mesa: Remove the non-required ARB_imaging extension.
Many of the EXT_ extensions in the subset have significant code
overhead with no users. It is not a required part of GL -- though
text describing the extension is part of the core spec since 1.2, it
is always conditional on the ARB_imaging extension.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 168554904bc079650124fbd026d9b75834eabc92 |
|
17-Sep-2010 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: fix assertion failure in GetTexImage for cubemaps
Can be reproduced with mesa/demos/src/tests/blitfb.
NOTE: This is a candidate for the 7.9 branch.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 603bef557220d68dbb165e775c7c9b0d6db7709e |
|
04-Sep-2010 |
Luca Barbieri <luca@luca-barbieri.com> |
mesa/st: add missing _mesa_set_fetch_functions in st_get_tex_image
Fixes piglit fdo25614-genmipmap.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 0f74efdef05c5c27b3137163d795dc91f34cc114 |
|
25-Aug-2010 |
Chia-I Wu <olv@lunarg.com> |
st/mesa: Fix glEGLImageTargetTexture2DOES.
stObj->pt should be set in st_bind_surface, just as in st_TexImage. On
the other hand, st_TexImage should unreference stObj->pt. It also needs
to initialize the texture image again as _mesa_clear_texture_object
clears the image.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 7f15dca6d963b0a69131e8761c477064dba49307 |
|
15-Apr-2010 |
Luca Barbieri <luca@luca-barbieri.com> |
mesa/st: use PIPE_TEXTURE_RECT for GL_TEXTURE_RECTANGLE
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 30f46e7b4c9d6c6f8c1c01825b344b90adc93982 |
|
01-Jul-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix comment
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 583f241716639ae7fc24eca38418d5860de229cb |
|
22-Jun-2010 |
Roland Scheidegger <sroland@vmware.com> |
st/mesa: remove bogus assertions st_CompressedTexSubImage2D
width/height may not be a multiple of blocksize (small mip levels / npot
textures). This should be handled just fine.
Fixes #28530.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a2817f6ae566b672f195cff22e14e2058d3617ea |
|
24-Apr-2010 |
Dave Airlie <airlied@redhat.com> |
st/mesa: attempt to fix TFP by using sampler views (v1)
Okay I think this is good enough for now, I can't see any other reason
for mesa to want to use a sampler view so lets just leave it at all the A->X conversions for now.
I've been running gnome-shell under r300g with this for day or so and it seems fine.
Signed-off-by: Dave Airlie <airlied@redhat.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 3293bcdc80cdfa20a2381aae2b94505bdf95d857 |
|
21-May-2010 |
Roland Scheidegger <sroland@vmware.com> |
Merge branch 'gallium-msaa'
Conflicts:
src/mesa/state_tracker/st_gen_mipmap.c
src/mesa/state_tracker/st_texture.c
|
| 127328bfadaa5f080730fd41f404f1bc74f490d3 |
|
17-May-2010 |
Roland Scheidegger <sroland@vmware.com> |
mesa/st: adapt to interface changes
adapt to blit changes, and also handle a bit more msaa state in theory
(incomplete, doesn't handle resolves in any way for now).
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 295a87f6c211322faefc4ef7f88f02722973f5b6 |
|
04-May-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove unused needFlush parameter to st_finalize_texture()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 013b332cbcad2b9d113e00c467a65d072eb61cec |
|
04-May-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: updated comments and fix some formatting in texture storage code
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| e79086865bd67f860dfd0d5951395495530022bc |
|
03-May-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: rename srcImageStride -> srcRowStride and fix-up formatting
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c7d1d34c580e8c76bf2f3f8687223e648e7ec5f1 |
|
03-May-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: consolidate and clean-up texture memory allocation code
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 41b8a2e9391cd85a65ba30a7e5f5068b5767d58a |
|
03-May-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: move some texture size calculation code
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 682fec0dca5bfd38ff9943663b7647e600fc4c1d |
|
03-May-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove old convolution-related vars and min pitch code
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| b02619914eed4bdb5c8bb2239c6e3b9639ed00f6 |
|
03-May-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove unsupported convolution code
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4b7812919a5db2f72bd3b9f6d760ffeb469ee3e4 |
|
03-May-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: updated comment
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 529b7b355d392b1534ccd8ff7b428dc21cbfdc21 |
|
03-May-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: restore original last_layer comparison
Commit e648d4a1d1c0c5f70916e38366b863f0bec79a62 changed the original
less-than test to a not-equal test. This was an effort to save some
memory by switching the texture layout to a non-mipmapped layout when
we mis-guessed about the original layout (thus saving some memory).
However, this causes us to hit a new (apparently broken) code path
when copying the old texture's data to the new texture. Simply
undo this change for the time being until the other/new bug is fixed.
Fixes fd.o bug 27933.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| b0427bedde80e3189524651a327235bdfddbc613 |
|
11-May-2010 |
José Fonseca <jfonseca@vmware.com> |
mesa/st: Remove internal flushes from Mesa state tracker.
Now that transfers are context operations it is the driver's
responsibility to ensure that transfers happen in order with all other
context operations, so flushes and finishes inside Mesa should be no
longer necessary. The attached patch implements that.
This should proportionate significant improvements for hardware drivers
which are able to stream transfers in the command buffers.
You can use the softpipe/llvmpipe_flush_resource() as reference
implementation of the worst case scenario, where the driver is not able
to streamline transfers. But the expectation is that driver
implementators will want to avoid flushing as much as possible.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 9adebe172df9fbf9ba359d949e64ce07bbef77b7 |
|
06-May-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: when copying mipmap levels between textures, start at BaseLevel
Saves some work and avoids potential issue with inconsistant mipmap
level sizes. As long as the mipmap levels from BaseLevel to MaxLevel
are consistant, we don't care about the other levels.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c6fdb950e9fdf42fb1d6c837019df23386fffee7 |
|
05-May-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: need to pass srcLevel to st_texture_image_copy()
Fixes a regression in mipmap setup.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 2b53f4a9c674e9b02df8a06759e7a2340f257081 |
|
04-May-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: return success/fail from guess_and_alloc_texture()
Before we looked at stObj->pt to see if we may have run out of memory,
but that's not a good indicator. This fixes the spurious GL_OUT_OF_MEMORY
errors that could arise before.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| e648d4a1d1c0c5f70916e38366b863f0bec79a62 |
|
29-Apr-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: ignore gl_texture_object::BaseLevel when allocating gallium textures
Previously, when we created a gallium texture for a corresponding Mesa
texture we'd only allocate space for mipmap levels >= BaseLevel.
This patch undoes that mechanism. This fixes a render-to-texture bug
when rendering to level 0 when BaseLevel=1.
Also, it makes sense to allocate the whole texture object memory when
BaseLevel > 0 since a common use of GL_TEXTURE_BASE_LEVEL is to
progressively load/render mipmaps. Eventually, the app almost always
fills in the level=0 mipmap image.
Finally, the texture image code is bit easier to understand now.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c7f5c9a3dc6350252e73b541bb85ab3ed9e64a9c |
|
28-Apr-2010 |
Brian Paul <brianp@vmware.com> |
Merge branch '7.8'
Conflicts:
src/mesa/state_tracker/st_gen_mipmap.c
|
| 7b640f9f708306b3e8c661771f29bf24bf8687fb |
|
28-Apr-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix incorrect RowStride computation
Fixes incorrect stride when getting a compressed tex image.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 76c7ad2e7d387feefe58dc2116b613fe11a8b273 |
|
23-Apr-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: clean-up: use st_context() everywhere
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 8283db88414f600e66510de713382c36899d4b03 |
|
23-Apr-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: replace 'usage' with 'bindings'
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a2a01853f3f40b4ef8b3f01503391877960bdaee |
|
20-Apr-2010 |
Brian Paul <brianp@vmware.com> |
gallium: replace pipe_resource::_usage with pipe_resource::usage
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5d3d63d45a037fdf603ddcff88da635c3ce8075e |
|
19-Apr-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove st_texture_object::pipe field
Just pass the pipe context to st_get_texture_sampler_view()
as is done for st_get_renderbuffer_sampler_view().
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 073048c872ea5893ad0c39b32ca171893c17148b |
|
19-Apr-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: s/st_renderbuffer_get_sampler_view/st_get_renderbuffer_sampler_view/
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 8a7ea577ac924016db5f86cbb408dd8e218c6782 |
|
19-Apr-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: s/st_get_stobj_sampler_view/st_get_texture_sampler_view/
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 7b8c4f22d4fd78829dd5843db92321ec0665932e |
|
16-Apr-2010 |
Vinson Lee <vlee@vmware.com> |
st/mesa: Move dereference and assignment to after NULL check.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| da8412ec19ad00627ae9139dc02f46f344bbb6ac |
|
12-Apr-2010 |
Chia-I Wu <olv@lunarg.com> |
st/mesa: Drop st_public support.
There is no user of st_public now.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 287c94ea4987033f9c99a2f91c5750c9083504ca |
|
10-Apr-2010 |
Keith Whitwell <keithw@vmware.com> |
Squashed commit of the following:
commit 0189cb2fde9f5d7326fd4bfbc2e52db4cce73b3e
Author: Keith Whitwell <keithw@vmware.com>
Date: Sat Apr 10 12:48:43 2010 +0100
gallium: don't use generic get_transfer func for textures
It doesn't know and can't fill in the stride value.
commit 65bc6f88fd9ce8ff90175b250e580bef2739ea35
Author: Chia-I Wu <olv@lunarg.com>
Date: Sat Apr 10 13:49:34 2010 +0800
i915g: Initialize screen surface function.
commit eb56e64986790aa2fa35534ce652b78656b0c3c5
Merge: f8b0a7f e7f1e5c
Author: Keith Whitwell <keithw@vmware.com>
Date: Sat Apr 10 00:38:43 2010 +0100
Merge commit 'origin/master' into gallium-resources
Conflicts:
src/gallium/drivers/r300/r300_texture.c
commit f8b0a7f6a3a98fd36ce90a81073ec8c8f09b684c
Merge: a3c9980 f43c679
Author: Keith Whitwell <keithw@vmware.com>
Date: Sat Apr 10 00:35:09 2010 +0100
Merge commit 'origin/master' into gallium-resources
Conflicts:
src/gallium/drivers/r300/r300_texture.c
commit a3c99807de37dc2c072f1d75ed3a11da333bc9a1
Author: unknown <michal@.(none)>
Date: Fri Apr 9 18:51:39 2010 +0200
scons: Add missing sources.
commit 927cec79cedb457efa9e6f335727cfcb8e4908e2
Author: Roland Scheidegger <sroland@vmware.com>
Date: Fri Apr 9 18:07:56 2010 +0200
gallium: fix another compile warning after merge. Hmpf.
commit 52953cd7b0e51deafecb812bdc40f9e45f9ac62a
Author: Roland Scheidegger <sroland@vmware.com>
Date: Fri Apr 9 18:02:11 2010 +0200
gallium: fix comment
commit 7c8763aa6cfc74adf1ea49c2bab25ca17b32575f
Author: unknown <michal@.(none)>
Date: Fri Apr 9 18:05:20 2010 +0200
util: Fix type cast.
commit 9d0086411a104b7cc9297aac0d1f82853118d7bf
Author: unknown <michal@.(none)>
Date: Fri Apr 9 18:04:33 2010 +0200
libgl-gdi: Use proper unwrap functions for resources.
commit 251a5cdd18ba31c690ef61f133dfc65cd4a45cf8
Author: Roland Scheidegger <sroland@vmware.com>
Date: Fri Apr 9 17:51:23 2010 +0200
gallium: more comments fixup
commit 8f3f9d5e1e9c0de98a3dfb19e81250d2c32ee4e9
Author: Roland Scheidegger <sroland@vmware.com>
Date: Fri Apr 9 17:48:18 2010 +0200
gallium: another fix after merge
commit 41f00a32ee5be91512c048bacb89ede0e04bc08d
Author: Roland Scheidegger <sroland@vmware.com>
Date: Fri Apr 9 17:44:30 2010 +0200
gallium: more pipe_texture/resource fixes after merge
commit faf53328d1154c51d8a59513f2bfcae62272b0bf
Author: Roland Scheidegger <sroland@vmware.com>
Date: Fri Apr 9 17:44:24 2010 +0200
gallium: fix comments for changed USAGE flags
commit fdcb17bea4b0798d316b56deea69832f41142adf
Author: Roland Scheidegger <sroland@vmware.com>
Date: Fri Apr 9 16:40:07 2010 +0200
gallium/pb: pb uses PB_USAGE_ flags, not PIPE_TRANSFER_ (same value anyway)
commit c95f7278ecc6db417ec1053279f2a8172c47aee9
Author: Keith Whitwell <keithw@vmware.com>
Date: Fri Apr 9 13:44:35 2010 +0100
llvmpipe: fix merge glitches
commit 28f8b8683175149a381be5eff263d4c20568bce7
Author: Keith Whitwell <keithw@vmware.com>
Date: Fri Apr 9 13:41:39 2010 +0100
r300g: update after merge for pipe_resources
commit 248c93cbc066ba6e3fadd94c5fcf3bdbb373d8fd
Author: Keith Whitwell <keithw@vmware.com>
Date: Fri Apr 9 13:41:20 2010 +0100
st/mesa: fix old pipe_texture usages
commit a563b1c5c2cb57b3ef28a3654d9b477460d13ced
Author: Keith Whitwell <keithw@vmware.com>
Date: Fri Apr 9 13:40:56 2010 +0100
r300g: remove unused variable
commit 734500131d828c9dfd68c5fa26b3e6b07e086d2d
Author: Keith Whitwell <keithw@vmware.com>
Date: Fri Apr 9 13:40:36 2010 +0100
nv50: fix compiler warning
commit efd402e13037e5c3e29759fa5b1c754c6d65d0e2
Merge: fec8a1d 5452615
Author: Keith Whitwell <keithw@vmware.com>
Date: Fri Apr 9 13:33:57 2010 +0100
Merge commit 'origin/master' into gallium-resources
Conflicts:
src/gallium/drivers/cell/ppu/cell_screen.c
src/gallium/drivers/cell/ppu/cell_texture.c
src/gallium/drivers/llvmpipe/lp_screen.c
src/gallium/drivers/r300/r300_context.c
src/gallium/drivers/r300/r300_render.c
src/gallium/drivers/r300/r300_screen.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/r300/r300_texture.c
src/gallium/drivers/r300/r300_transfer.c
src/gallium/state_trackers/egl/common/egl_g3d.h
src/gallium/state_trackers/egl/kms/native_kms.c
src/gallium/state_trackers/egl/x11/native_dri2.c
src/gallium/state_trackers/egl/x11/native_ximage.c
commit fec8a1db13fac04ef56f6ece799d1f20aa3011db
Author: Marek Olšák <maraeo@gmail.com>
Date: Sat Apr 3 07:58:34 2010 +0200
util: fix assertion failures in pipe_buffer_flush_mapped_range
commit 1ff3984c2edce9927744f3cce3e7b07778990170
Author: Roland Scheidegger <sroland@vmware.com>
Date: Thu Apr 8 17:44:54 2010 +0200
docs: fix transfer_map description
commit 20bf14be8ac6438cb1afa38212e306fc06a5ed40
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Apr 8 14:39:13 2010 +0100
util: fix up several uses of pipe_map_buffer_range
This function used to return a pointer to where the start of the
actual buffer would have been, even though only the requested range is
being mapped.
In the resources change, the function was modified to use a transfer
internally, and started returning the pointer to the beginning of the
transfer, ie the mapped range.
Some users of the function were changed to reflect this new behaviour,
some were not. Since then the function has reverted to its original
behaviour, matching master.
This change restores some of the users of the map_buffer_range helper
to expect the old/original behaviour.
commit 33179a86058b68b518f40971030db337dc26fe6e
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Apr 8 14:38:54 2010 +0100
mesa/st: fix up several uses of pipe_map_buffer_range
This function used to return a pointer to where the start of the
actual buffer would have been, even though only the requested range is
being mapped.
In the resources change, the function was modified to use a transfer
internally, and started returning the pointer to the beginning of the
transfer, ie the mapped range.
Some users of the function were changed to reflect this new behaviour,
some were not. Since then the function has reverted to its original
behaviour, matching master.
This change restores some of the users of the map_buffer_range helper
to expect the old/original behaviour.
commit 3f5363d4dc9d7ad48467ae82d58d5f3d9bd10698
Author: Keith Whitwell <keithw@vmware.com>
Date: Wed Apr 7 17:26:52 2010 +0100
util: map_range and flush_range have offsets relative to start of buffer
commit 7eb1bfb97a790c73188d6b616d54fb3849e69b1e
Author: Keith Whitwell <keithw@vmware.com>
Date: Wed Apr 7 17:26:08 2010 +0100
nv50: fix compiler warning
commit d040daff0642dd791ac38e9b353dc251b03fc873
Author: Keith Whitwell <keithw@vmware.com>
Date: Wed Apr 7 17:25:58 2010 +0100
nvfx: fix compiler warning
commit 49ec01dffb8e99ab3ff8f856287db7b4df3efed6
Author: Chia-I Wu <olv@lunarg.com>
Date: Mon Apr 5 11:58:53 2010 +0800
mesa/es: Fixes for gallium-resources.
commit 47c87ada452be45766928a01b6d69da63e3a5f5e
Author: Marek Olšák <maraeo@gmail.com>
Date: Sat Apr 3 05:19:20 2010 +0200
r300g: fix transfers for textures created from winsys handles
commit 5f2701fddaef9c18d85c049311c2819c49cc1ae0
Author: Luca Barbieri <luca@luca-barbieri.com>
Date: Sat Apr 3 03:52:38 2010 +0200
nouveau: don't use the staging usage
Maybe it could make sense, but for now dynamic is enough.
None of these avoid uncached reads from GART on AGP cards.
commit 0db20fa49e008f35911007fa7ed9be1d678a2161
Author: Luca Barbieri <luca@luca-barbieri.com>
Date: Sat Apr 3 03:27:19 2010 +0200
i965: add brw_resource.c to Makefile
commit b94f3e7389cbd1b6465de3c04e8059ce73f1ea1f
Author: Luca Barbieri <luca@luca-barbieri.com>
Date: Sat Apr 3 01:48:33 2010 +0200
nouveau: fix for gallium-resources
commit a01ff99a19986e6beb7903431e60a074945b09bc
Author: Roland Scheidegger <sroland@vmware.com>
Date: Thu Apr 1 19:26:35 2010 +0200
gallium: fix missing includes
commit 26aeded562ce947a6deeb867fe22bf8daf7b1a1a
Author: Roland Scheidegger <sroland@vmware.com>
Date: Thu Apr 1 19:19:18 2010 +0200
gallium: remove video interface and related stuff
These interfaces weren't quite was needed, and building disabled for a while.
Some code actually build since some branch merge, and were now not fully
converted to gallium-resources.
See http://www.mail-archive.com/mesa3d-dev@lists.sourceforge.net/msg09619.html
for a discussion of this. Video related work is done in origin/pipe-video
branch.
commit c64285aea45997a276fb141d7badc8a04f617c7c
Author: Roland Scheidegger <sroland@vmware.com>
Date: Thu Apr 1 18:45:54 2010 +0200
python: fixes for resource changes
doesn't look quite ok yet, but sort of compiles.
commit 03d4d5a41f5cf158a358fd705c695e1c987a328f
Author: Roland Scheidegger <sroland@vmware.com>
Date: Thu Apr 1 18:34:46 2010 +0200
gallium: s/u_box_orgin_2d/u_box_origin_2d
commit 2444f023142bcaf7bd310b44794580f273254408
Author: Marek Olšák <maraeo@gmail.com>
Date: Thu Apr 1 03:26:50 2010 +0200
r300g: fix segfault when the transfers functions are used
Still broken.
commit 6f09bf4066ab651b323c131bb07978e700519805
Author: Roland Scheidegger <sroland@vmware.com>
Date: Thu Apr 1 00:05:12 2010 +0200
r300g: compile fixes
commit 76711ff40d2092f9ef03d452de7458c4e76d9246
Author: Roland Scheidegger <sroland@vmware.com>
Date: Thu Apr 1 00:04:47 2010 +0200
nvfx: more compile fixes
commit c5d2e90c9cc119447a447dc04a4bce4ab91fc671
Author: Roland Scheidegger <sroland@vmware.com>
Date: Wed Mar 31 23:18:50 2010 +0200
gallium: more mostly merge fallout fixes...
commit fbc3722696790857f4adc936190406e74dffd969
Merge: 86d9225 d97f696
Author: Roland Scheidegger <sroland@vmware.com>
Date: Wed Mar 31 22:09:35 2010 +0200
Merge commit 'origin/master' into gallium-resources
Conflicts:
src/gallium/drivers/cell/ppu/cell_screen.c
src/gallium/drivers/i915/i915_buffer.c
src/gallium/drivers/i915/i915_context.h
src/gallium/drivers/i915/i915_resource_texture.c
src/gallium/drivers/i915/i915_screen.c
src/gallium/drivers/i915/i915_state_emit.c
src/gallium/drivers/i965/brw_resource_texture.c
src/gallium/drivers/llvmpipe/lp_screen.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/nvfx/nv30_fragtex.c
src/gallium/drivers/nvfx/nv40_fragtex.c
src/gallium/drivers/nvfx/nvfx_miptree.c
src/gallium/drivers/nvfx/nvfx_screen.c
src/gallium/drivers/nvfx/nvfx_transfer.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/svga/svga_screen_texture.c
src/gallium/state_trackers/dri/common/dri_drawable.c
src/gallium/state_trackers/dri/common/dri_screen.c
src/gallium/state_trackers/dri/common/dri_st_api.h
src/gallium/state_trackers/dri/drm/dri1.c
src/gallium/state_trackers/dri/drm/dri1.h
src/gallium/state_trackers/dri/drm/dri2.c
src/gallium/state_trackers/python/st_device.c
src/gallium/state_trackers/python/st_sample.c
src/mesa/state_tracker/st_cb_clear.c
src/mesa/state_tracker/st_cb_drawpixels.c
src/mesa/state_tracker/st_cb_readpixels.c
src/mesa/state_tracker/st_cb_texture.c
src/mesa/state_tracker/st_extensions.c
commit 86d9225d19d194eebbbe95b059695697c3307d15
Author: Roland Scheidegger <sroland@vmware.com>
Date: Wed Mar 31 19:06:06 2010 +0200
gallium: more fixes for bind changes
commit a215ef0606347e34669a580ec8df93ede7e46399
Author: Roland Scheidegger <sroland@vmware.com>
Date: Wed Mar 31 18:48:36 2010 +0200
gallium/docs: some updates for bind changes
commit c6c7e6746cbc7af59f7972719ed76f43e8ac16fc
Author: Roland Scheidegger <sroland@vmware.com>
Date: Tue Mar 30 20:24:26 2010 +0200
gallium: more bind change compile fixes
commit a83fa1504b78180524a5eb454ae186741a27cdf8
Author: Roland Scheidegger <sroland@vmware.com>
Date: Tue Mar 30 17:37:13 2010 +0200
compile fixes
commit 30dc8afcd243d6a160571bac5f06d773e54a4196
Author: Roland Scheidegger <sroland@vmware.com>
Date: Tue Mar 30 16:56:28 2010 +0200
fix some merge issues
commit 30aa617fee11fe50c0a9c2f33fcd120a474f5e34
Merge: 1dde609 3a830bc
Author: Roland Scheidegger <sroland@vmware.com>
Date: Tue Mar 30 16:09:45 2010 +0200
Merge commit 'origin/gallium-buffer-usage-cleanup' into gallium-resources
Conflicts:
src/gallium/drivers/nouveau/nouveau_screen.c
src/gallium/drivers/nvfx/nvfx_transfer.c
src/gallium/winsys/drm/radeon/core/radeon_drm_buffer.c
commit 1dde609ad6c9d2dfa0a5f7167f3c5bcf023b7c4d
Author: Roland Scheidegger <sroland@vmware.com>
Date: Wed Mar 24 02:35:00 2010 +0100
docs: some updates for pipe_resource
commit f236f9660d31b936f54b64ae07e569f8637067bd
Author: Luca Barbieri <luca@luca-barbieri.com>
Date: Wed Mar 24 01:31:28 2010 +0100
nvfx: fix for gallium-resources
It seems to work with basic applications but almost surely needs more work.
In particular, it probably shouldn't use PIPE_BUFFER_USAGE_* flags
and should use PIPE_TRANSFER_* in several places.
Also, we probably don't want the vtable indirect calls and that ought
to be replaced with something better instead.
commit 5a136ad7b63768cb9a753eff8686c44592e62325
Author: Luca Barbieri <luca@luca-barbieri.com>
Date: Wed Mar 24 01:31:19 2010 +0100
nv50: fix build in gallium-resources
Not actually tested.
Also needs next patch tee to actually build, this is just the nv50 part
split from the rest.
commit 3a830bc4a3f0f60c925b9434845a6bcad9a913c5
Author: Keith Whitwell <keithw@vmware.com>
Date: Tue Mar 23 14:00:52 2010 -0700
st/egl: fix up for binding flags
commit c6a80dc32ef17bc972d4137ce7444ebed4d28ebb
Author: Keith Whitwell <keithw@vmware.com>
Date: Tue Mar 23 13:52:15 2010 -0700
r300: restore 4k alignment for oqbo buffers
commit e75a8d5ea9e0ffcf67bc858e08937e10b4fc74ba
Author: Keith Whitwell <keithw@vmware.com>
Date: Tue Mar 23 13:00:07 2010 -0700
gallium: bind flags
commit 1f5b509543a7f399835fd9edf27c18e1643fab7d
Author: Roland Scheidegger <sroland@vmware.com>
Date: Tue Mar 23 19:32:21 2010 +0100
i965g: scons compile fixes
commit 2c385f8f905ec794d9119c05c6293e0b1b9b565a
Author: Roland Scheidegger <sroland@vmware.com>
Date: Tue Mar 23 19:20:33 2010 +0100
nouveau: drm compile fix
commit b285086ebd5132b47c340897c4622cc9fbd286cb
Author: Roland Scheidegger <sroland@vmware.com>
Date: Tue Mar 23 18:36:19 2010 +0100
r300g: pipe_resource compile fixes
bring back mistakenly deleted radeon_buffer.h
plus some more
commit 7810606f423ef2f51f0a14b919640c2fd2c931aa
Author: Michal Krol <michal@vmware.com>
Date: Tue Mar 23 16:21:03 2010 +0100
softpipe: Map GS constants, too.
commit 366f1176fb89d2b1978da6cfe60000b76bbc7338
Author: Roland Scheidegger <sroland@vmware.com>
Date: Tue Mar 23 15:51:52 2010 +0100
failover: update for pipe_resources
commit 615f44d70d293704ed821bc0b21fcfe6e363895d
Author: Roland Scheidegger <sroland@vmware.com>
Date: Tue Mar 23 15:51:02 2010 +0100
identity: remove double is_resource_reference assignment
commit 7008586020395905ddfff333d02b3893de369796
Author: Roland Scheidegger <sroland@vmware.com>
Date: Tue Mar 23 15:50:32 2010 +0100
trace: compile fix
commit 058c5697bda4c9cf7b49d26ee27a34586544efaa
Merge: dd7ba13 b33fd3c
Author: Keith Whitwell <keithw@vmware.com>
Date: Tue Mar 23 06:40:39 2010 -0700
Merge commit 'origin/gallium-resources' into gallium-buffer-usage-cleanup
Conflicts:
src/gallium/state_trackers/vega/api_filters.c
src/mesa/state_tracker/st_cb_drawpixels.c
commit b33fd3ce3daf2921a895367d0ed3fd9c718a8575
Author: Michal Krol <michal@vmware.com>
Date: Mon Mar 22 21:03:26 2010 +0100
gallium: Usage parameter of get_transfer/transfer_inline_write is a bitfield.
commit 9c1162d9d656062a490a529997def3f674cc61fc
Author: Michal Krol <michal@vmware.com>
Date: Mon Mar 22 20:50:49 2010 +0100
scons: Update file lists after gallium-resources changes.
commit af9793ab9e5386b150d6b25c0d1978fdc67172e4
Author: Michal Krol <michal@vmware.com>
Date: Mon Mar 22 20:04:39 2010 +0100
gallium: Do not use `template` for formal parameter names.
commit dc2e12d714c444af9ff1acdd5a7e91408b116c99
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 22:41:34 2010 +0000
ws/nouveau: remove pipe_texture reference
commit b94c72329f1be85887d40d49b0586979da469d77
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 22:40:41 2010 +0000
ws/xlib: remove pipe_buffer reference in comment
commit 0a2af3eeae7de1d1cb433f0a2c35136b115f9920
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 22:39:34 2010 +0000
st/vega: clean up reference to pipe_texture
commit 437ce98daae46be5d532fbb04c7cbf4a503c1623
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 22:39:02 2010 +0000
st/python: begin conversion to pipe_resources, much more to do
commit 1b02e1ee3e5e87774f0c9e5f0e1898b7f8de1b16
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 22:29:34 2010 +0000
st/xorg: update for pipe_resources
commit eb39977fe7a1d9f0c3f4f2d4303a93c2c613cc3b
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 22:23:51 2010 +0000
st/dri: update for pipe_resources
commit e447aeff597a4d8c0f5de25854c14c99f2cc138c
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 22:23:36 2010 +0000
st/egl: update for pipe_resources
commit e4cc48da8fdbd7d521257a6d7cd10e6fc5aa1a65
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 22:08:44 2010 +0000
r300: drop use of R300 DONT SYNC flag
commit 129a83ab4d32e44ded5faea3f86ae5e1e62cddb6
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 22:08:17 2010 +0000
pipebuffer: use transfer flag
commit 575b35ee6b683d77095ef21c573c1de207107e79
Merge: f29ac73 9fc6c8b
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 22:03:25 2010 +0000
Merge commit 'origin/master' into gallium-resources
Conflicts:
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/r300/r300_context.c
src/gallium/drivers/r300/r300_texture.c
src/gallium/winsys/drm/radeon/core/radeon_buffer.h
commit f29ac73f3f626d5779a627b7fa6fecdb60a35aab
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 18:37:25 2010 +0000
cell: attempt to convert to pipe_resources
Can't even compile test this driver.
commit 484b1947f4af81bab60b41f21c3c23ea6f67488c
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 17:25:50 2010 +0000
nvfx: restore usage of pipe_winsys
The interface that cannot be killed...
commit ac76ac6eb30f4f9aa9f5733d60358b357925953a
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 17:25:10 2010 +0000
nv50: fix warning
commit 9683f4423449fa5acf6c019c571223650473bd82
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 17:14:31 2010 +0000
util: restore u_simple_screen, nouveau still relies on it
commit 961cbcb62232689c959965384c6aa9b8eca697c1
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 16:51:54 2010 +0000
nouveau: convert nvfx and nv50 to pipe_resources
Compile tested only.
This was a deeper change than I was hoping for, due to the
layering of the pipe_texture implementation in each driver on
top of a shared pipe_buffer implementation in the shared code.
Have modified the shared code to act as a set of convenience
routines operating on nouveau_bo objects.
Each driver now uses the u_resource_vtbl technique to split the
implementation of pipe_resources between the existing miptree code
for textures and a new, minimal buffer implementation in each
driver.
Eventually these should be combined, not least because APIs are now
allowing things like binding buffer resources as textures and render
targets.
commit 18ba74016db13b23282f5033ee37b628a12ee566
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 10:02:54 2010 +0000
r300: fix compilation after merge
Also build r300 by default.
commit eb9c0175c8e4baca3fcb0b8364f83ceba9d74e0d
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 09:59:49 2010 +0000
st/vega: fix up after merge
commit ea8dd1d4ae7b58c9315c3491046ef3852ddd3377
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 09:59:44 2010 +0000
aux: remove unused piperesource helpers
commit be7af29d3ad1a10409b0ea689d882cf30a4e1d62
Merge: d22c2c6 12deb9e
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 21 09:54:53 2010 +0000
Merge commit 'origin/master' into gallium-resources
Conflicts:
src/gallium/auxiliary/cso_cache/cso_context.c
src/gallium/auxiliary/cso_cache/cso_context.h
src/gallium/drivers/r300/r300_context.c
src/gallium/drivers/r300/r300_render.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/r300/r300_state_derived.c
src/gallium/state_trackers/vega/api_filters.c
src/gallium/state_trackers/vega/image.c
src/gallium/state_trackers/vega/image.h
src/gallium/state_trackers/vega/mask.c
src/gallium/state_trackers/vega/mask.h
src/gallium/state_trackers/vega/paint.c
src/gallium/state_trackers/vega/paint.h
src/gallium/state_trackers/vega/renderer.c
src/gallium/state_trackers/vega/renderer.h
src/gallium/state_trackers/vega/shader.c
src/gallium/state_trackers/vega/vg_context.h
src/gallium/state_trackers/vega/vg_tracker.c
src/mesa/state_tracker/st_manager.c
commit d22c2c6cb23a063e3334a165d0c5c3d73f05d234
Author: Keith Whitwell <keithw@vmware.com>
Date: Sat Mar 20 11:48:54 2010 +0000
drm/r300: update for r300g pipe_resources conversion
Remove old files that related to pipe_buffers but weren't being
built. Hopefully this is correct.
commit f07b2c836958bee5796899123eca4ed05ac6242b
Author: Keith Whitwell <keithw@vmware.com>
Date: Sat Mar 20 11:47:03 2010 +0000
r300: convert to pipe_resources
Do a very shallow conversion - basically keeping the existing
buffer and texture code intact and using a vtbl struct
inside our resource struct to select between the two implementations.
The buffer and texture treatments could be further merged without
much effort, but try to keep the existing code working at this point.
commit feca9c3ca62daaf0d8745370106d4e3b22340c49
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Mar 18 06:00:34 2010 +0000
gallium: update new merges to pipe_resource
commit 1cad983eac77a0c5333e6a3ce92b90ac87407714
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Mar 18 06:00:19 2010 +0000
drm/sw: update new merges to pipe_resource
commit 191d39490ed792c569f98d42cf05891b264f71f8
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Mar 18 06:00:01 2010 +0000
vg: update new merges to pipe_resource
commit b727c59bc44812ad503d9390505c92b738a5b8b0
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Mar 18 05:59:38 2010 +0000
llvmpipe: update new merges to pipe_resource
commit 5f4b64b37fdcd70162c382b2ebbd494bef751dbd
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Mar 18 05:59:23 2010 +0000
brw: pipe_resource fixes
commit d4aca209f531f1b65bf706ce1e5fc0375b587eb6
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Mar 18 05:59:06 2010 +0000
util: update new merges to pipe_resource
commit cf6bef0afee10763c78509a3d17e9a6e49bcd3c8
Merge: 1997231 6de8e56
Author: Keith Whitwell <keithw@vmware.com>
Date: Thu Mar 18 05:38:50 2010 +0000
Merge commit 'origin/master' into gallium-resources
commit 1997231916144485c3c4a36f53eda39fce460272
Merge: ad88ac7 e1ee3ea
Author: Keith Whitwell <keithw@vmware.com>
Date: Wed Mar 17 08:46:38 2010 +0000
Merge commit 'origin/master' into gallium-resources
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/util/u_blit.c
src/gallium/auxiliary/util/u_blit.h
src/gallium/auxiliary/util/u_gen_mipmap.c
src/gallium/auxiliary/util/u_gen_mipmap.h
src/mesa/state_tracker/st_cb_texture.c
src/mesa/state_tracker/st_gen_mipmap.c
commit ad88ac79034a91670940276e722bdd398d5c9023
Merge: 77bc770 8cdfd12
Author: Keith Whitwell <keithw@vmware.com>
Date: Tue Mar 16 09:13:07 2010 +0000
Merge branch 'gallium-sampler-view' into gallium-resources
Conflicts:
src/gallium/auxiliary/cso_cache/cso_context.c
src/gallium/auxiliary/util/u_blit.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/softpipe/sp_texture.c
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/state_tracker/st_framebuffer.c
src/mesa/state_tracker/st_texture.c
commit 77bc770c991ea025c82eaa4e0e2390efd825d96d
Author: Keith Whitwell <keithw@vmware.com>
Date: Mon Mar 15 22:21:48 2010 +0000
util: missing file
commit f83c91db8ae63a3c3a34ff21492427a5663fb760
Merge: c1d4774 42910eb
Author: Keith Whitwell <keithw@vmware.com>
Date: Mon Mar 15 09:48:58 2010 +0000
Merge commit 'origin/gallium-sampler-view' into gallium-resources
Conflicts:
src/gallium/drivers/nv40/nv40_transfer.c
src/gallium/drivers/nvfx/nvfx_transfer.c
src/gallium/drivers/trace/tr_drm.c
commit dd7ba1378fc50710667724d30d6d4cf1125ad61e
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 23:54:36 2010 +0000
gallium: start a cleanup of buffer_usage
Remove fairly meaningless CPU/GPU READ/WRITE flags and
replace with proper usages.
commit c1d4774187189f4af8ff421b210824f3d53ceefb
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 23:05:45 2010 +0000
llvmpipe: don't FREE userbuffer data
commit 9bfa07afe179f8060e7beefb754a29c4d9c6e349
Merge: 65757a1 08cddfe
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 22:54:51 2010 +0000
Merge commit 'origin/master' into gallium-resources
Conflicts:
src/gallium/drivers/llvmpipe/lp_rast.c
src/gallium/drivers/llvmpipe/lp_scene.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/llvmpipe/lp_texture.h
src/gallium/drivers/softpipe/sp_texture.c
src/gallium/drivers/svga/svga_screen_texture.c
commit 65757a143f8e3fcd7afbc1ff92db44a823edf46c
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 22:41:17 2010 +0000
svga: build fixes
commit 2f5435220501d4b3050cab2bb1dce6174cd13ff6
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 22:39:25 2010 +0000
gallivm: build fix
commit 42642ec0984107d82b740711f2debbf38457a06e
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 22:38:33 2010 +0000
llvmpipe: convert to pipe_resources
commit 7bbcb21e20cb545ef8dd5fc61d67ed931c69e813
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 22:19:30 2010 +0000
gallivm: convert to pipe_resources
commit 88ae0d04610ca52649b42e32141a52af6d5a739b
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 21:01:22 2010 +0000
configs: build svga
commit 0e112bc69828e65085ebfaef895ecd78fe53f1c4
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 21:01:17 2010 +0000
gallium: restore PIPE_BUFFER_USAGE_CUSTOM
commit 102aca688b95c976b7178b84092fba7d041ff9d2
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 21:00:41 2010 +0000
util: more transfer helpers
commit a79f6a4a0836fc64c07f9aeec21d914474fe3649
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 20:59:36 2010 +0000
svga: convert to use pipe_resrource
As with others so far, a fairly shallow conversion.
commit 087fb54492fa5e3baf040c5efbf7dacd98a8849b
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 18:38:08 2010 +0000
brw: fix function name
commit cfc9dd707d16e06fd23b6926da3a6e2269f31dc8
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 18:19:06 2010 +0000
gallium: enable brw compile
commit 8a5b86d76bdd3c7de63322423f59940a4dc2ee25
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 18:18:50 2010 +0000
brw: compiles with pipe_resource
commit 563ca458b548c41ca4dca559354c16ca1a80d009
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 18:18:42 2010 +0000
i915: hook up userbuffer create
commit b5095b48247b6020e36cc942ac145c3fccbe9a19
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 17:20:51 2010 +0000
i915: use helpers for is_resource_referenced
commit d5392bdc6d70002acf9c5bac0fde14ba405c4d84
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 17:20:38 2010 +0000
util: helpers for is_resource_referenced
commit 2f3492a5aefbb2e745f6700d8e910ebb5cbb98cf
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 17:08:50 2010 +0000
i915: remove buffer.c again
commit 1373a35b65fcc25ec6cdfea2703bbb3417de2c6d
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 17:08:34 2010 +0000
i915: add new files to scons
commit 0251612d70e57fe38e10e75915b394631d224f2c
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 16:38:29 2010 +0000
i915: compiling with pipe_resources
commit 9a0235864252929a8eedd44dbd2fe30fe54c531d
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 13:51:16 2010 +0000
gallium: remove inline_read transfer
commit a6ba315e25793e0c228d3a4ae2f8201634dc9ff0
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 13:50:32 2010 +0000
trace: get running
Some dumping will be incorrect or disabled, but it runs without
crashing
commit 2133f1d90aa919662a8420a0cf3b4557e6ec1afd
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 13:49:42 2010 +0000
gallium: remove the inline_read transfer
There aren't enough users of this to justify it.
commit bccaf1fa30881f6b4fb189a9b74fc7af79c3b481
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 12:30:37 2010 +0000
identity: hook up inline transfer operations
commit e4c152a344f2f53c842b810724a2ae7cb4554f58
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 12:21:54 2010 +0000
gallium: build trace and identity
commit 0b5a311db78852fa9fd021e17b5968a1e0436b49
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 12:21:36 2010 +0000
gallium: add more of the transfer state to pipe_transfer
Not really sure if recording all the arguments to the
create_{transfer,texture,surface,etc} functions in the result of those
calls is a great idea, but it seems we're fairly dependent on it
throughout the code.
commit a23985c26eafe76b0a7dacc892e50cb589f211fe
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 12:19:46 2010 +0000
identity: compiles with pipe_resources
commit d0d630944304c208f6dade6ef8836763ee2bc7b4
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 12:13:02 2010 +0000
trace: compiles with pipe_resources
commit a4451ea459cc8bfc915fe6aed2891b90854b6c9d
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 11:39:50 2010 +0000
softpipe: give userbuffers a format other than NONE
Most mesa demos working
commit 32bb1bd4ba29884a4ecfa11c8441d33dfceabcef
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 11:39:21 2010 +0000
util: correct argument order in pipe_buffer_map
commit 7e2696c06445282feb781047277b260308760a33
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 11:32:55 2010 +0000
softpipe: transfer flush
commit a0543b13c042e3c1142522d9d136f16fd4cabf78
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 11:32:13 2010 +0000
util: noop implementation of transfer_flush_region
commit ce418533be752dbeb164e7ff82a99483048e482b
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 11:26:07 2010 +0000
gallium: softpipe runs gears with pipe_resources
commit bfda4f2eb34498e4b7f3c608d30fccff6bb9651b
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 11:25:48 2010 +0000
util: get clip_tile working again
commit f5ef219c3bed62b6a0da842e675fae16268e0fbe
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 09:43:20 2010 +0000
softpipe: use u_transfer helpers
commit 072957aab25affecf0702e925310e46c694a5ee4
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 09:42:46 2010 +0000
util: helpers for inline transfers
commit 9c45561fb0d7a52400093bcb2ce5f727fafd7777
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 09:42:25 2010 +0000
util: fix typo calculating transfer box
commit f3e98fd47f36804d019a684d49ff230df3ab0cf5
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 09:25:46 2010 +0000
st/vega: convert to pipe_resource
commit d1b7b00afc944f6499c83d676c7642115d62a62c
Author: Keith Whitwell <keithw@vmware.com>
Date: Sun Mar 14 08:37:56 2010 +0000
gallium: begin converting drivers to pipe_resource
Work in progress...
commit 51c25117f5d6da1926a2be5ecc66677952a8abf0
Author: Keith Whitwell <keithw@vmware.com>
Date: Sat Mar 13 20:16:27 2010 +0000
gallium: work in progress on layering resources on top of old textures
Helper code in an aux module to avoid rewriting all the drivers.
commit fb6764d3ce95c55aa78af2f1c8cbb17b79ce1ba2
Author: Keith Whitwell <keithw@vmware.com>
Date: Sat Mar 13 19:19:09 2010 +0000
heaps of wip
commit ee6b3bc730fcdaf8da3646d62f04578ec06d36a1
Author: Keith Whitwell <keithw@vmware.com>
Date: Sat Mar 13 16:38:02 2010 +0000
wip2
commit 1830880212445189fe267d615075239ed17c7cc0
Merge: 90b4045 47bfbd4
Author: Keith Whitwell <keithw@vmware.com>
Date: Sat Mar 13 15:14:03 2010 +0000
Merge branch 'gallium-sampler-view' into gallium-resources
Conflicts:
src/gallium/include/pipe/p_context.h
src/mesa/state_tracker/st_atom_texture.c
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_drawpixels.c
src/mesa/state_tracker/st_cb_texture.c
src/mesa/state_tracker/st_context.c
src/mesa/state_tracker/st_context.h
src/mesa/state_tracker/st_texture.h
commit 90b4045fbc0a093fcd04efba7e045ec259c490b8
Author: Keith Whitwell <keithw@vmware.com>
Date: Sat Mar 13 14:52:43 2010 +0000
wip
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| cfbbe244d7438a60d389ae9d996dd430f79f362f |
|
29-Mar-2010 |
José Fonseca <jfonseca@vmware.com> |
mesa/st: util_format_is_compressed() -> util_format_is_s3tc().
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| e71c1589d8e5ab3c81b0fc04f4720c74849c4f15 |
|
24-Mar-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix typo in prev commit
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 2d6befd9d1e8dcf6495fe1b9cef12224046f3095 |
|
24-Mar-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix sampler_view destruction bug when texture is shared
Since texture's can be shared by many contexts, the texture's sampler
view's context pointer might be invalid by time we delete the texture.
Prevent crashes/etc by setting the sampler view's context to be the
calling context before deleting it. This should be safe as long as
all contexts which share the texture are using the same gallium driver.
That's a reasonable assumption since pipe_texture objects aren't
compatible between different drivers anyway.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c11d582411a999ed40db4c02143dd380113e0ffd |
|
17-Mar-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: plug in default for pipe_context::surface_copy() if needed
This lets us avoid conditionals and duplicated code in several places.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 90fe8c39f18512d22cdf52cbaa3e86a94a831ee2 |
|
17-Mar-2010 |
Corbin Simpson <MostAwesomeDude@gmail.com> |
st/mesa: Fix build breakage.
Nearly certain this is what was intended; it compiles, but I'm not sure
this path is ever hit in my tests.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f0f04cd12db156ec53b7ea46fae27199af121f90 |
|
17-Mar-2010 |
Pauli Nieminen <suokkos@gmail.com> |
Merge branch '7.8' into master
Conflicts:
Makefile
src/mesa/main/version.h
|
| 40c3861e1e98116c573027b054a6a05208c53b6a |
|
16-Mar-2010 |
Michal Krol <michal@vmware.com> |
st/mesa: Invalidate sampler view when texture object changes.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 8f55a95178069d5e8b18647e6b675fc403d68073 |
|
15-Mar-2010 |
Roland Scheidegger <sroland@vmware.com> |
gallium: change remaining util functions to use cso sampler views
changes arguments of util_blit_pixels_tex and util_gen_mipmap to
struct pipe_sampler_view * instead of struct pipe_texture *.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 6b60820fde8596966b1ffdb5d008e94773b2f321 |
|
15-Mar-2010 |
Michal Krol <michal@vmware.com> |
st/mesa: Pass in correct sampler view object to blitter.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f2bc089d148253d7a411e94257633ce40ec1c6a9 |
|
15-Mar-2010 |
Michal Krol <michal@vmware.com> |
gallium: util_blit_pixels() takes source sampler view as argument.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 47bfbd452c93e6a8db013fb90d9f42210cf24889 |
|
13-Mar-2010 |
Keith Whitwell <keithw@vmware.com> |
Merge commit 'origin/master' into gallium-sampler-view
Conflicts:
src/gallium/auxiliary/util/u_tile.c
src/gallium/auxiliary/util/u_tile.h
src/gallium/drivers/identity/id_context.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_setup.h
src/gallium/drivers/softpipe/sp_tex_tile_cache.c
src/gallium/include/pipe/p_context.h
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_drawpixels.c
|
| 63af29bfbe265318bcf5be69e420de361b900321 |
|
12-Mar-2010 |
Keith Whitwell <keithw@vmware.com> |
mesa: Fix memory leak in decompress-with-blit.
(cherry picked from commit f05a4ee6f2840590c90da4be2fe5c6295410a5af)
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| b8030c6561e019e079b5be2fe64ec804df4bfa03 |
|
12-Mar-2010 |
Michal Krol <michal@vmware.com> |
st/mesa: Associate a sampler view with an st texture object.
Lazily create a sampler view when the texture is being bound
for the first time.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| d35ecca5ee231c072687578642e0c22c6c0590b1 |
|
11-Mar-2010 |
Keith Whitwell <keithw@vmware.com> |
gallium: remove pipe_context member from pipe_transfer
There was very little use for this beyond permitting the
pipe_context::tex_transfer_destroy() function to omit the pipe_context
argument.
This change adds the pipe_context argument into tex_transfer_destroy()
so that it looks like other pipe_context functions, and removes the
pipe_context pointer from pipe_transfer.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 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/mesa/state_tracker/st_cb_texture.c
|
| b628950662a97452e539bcc704bd2acee70f8355 |
|
24-Feb-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: whitespace fixes
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 32f2fd1c5d6088692551c80352b7d6fa35b0cd09 |
|
19-Feb-2010 |
Kristian Høgsberg <krh@bitplanet.net> |
Replace _mesa_malloc, _mesa_calloc and _mesa_free with plain libc versions
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 45dac0d82a5a69166e86dce77c2550f7512c541e |
|
03-Feb-2010 |
José Fonseca <jfonseca@vmware.com> |
Merge branch 'gallium-embedded'
|
| 28486880ca3ec39419ccee0cb1a3bedc9ef7117c |
|
02-Feb-2010 |
José Fonseca <jfonseca@vmware.com> |
gallium: pipe/p_inlines.h -> util/u_inlines.h
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| bdf975e9ad25ee65d796a3c1ce3f2afbd2889c4e |
|
02-Feb-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix texture deallocation bug
This fixes a bug reported by Christoph Bumiller on mesa3d-dev.
When a texture is first created as RGBA, then re-defined with
glTexImage(internalFormat=GL_DEPTH_COMPONENT) we failed to deallocate
the original texture. When this texture was bound as a FBO surface,
the depth/Z surface format was RGBA instead of Z. Depending on the
driver this led to a failed assertion or FBO validation failure.
This patch does three things:
1. Remove ancient code that mysteriously tested if we were replacing
the smallest mipmap level and tested if the texture was not a cube map
texture. I can't see any reason for those tests.
2. Move the width=height=depth=0 test to after the code which frees
texture data. Calling glTexImage with width=height=depth=0 and data=NULL
is a way to free a single mipmap level.
3. Update the code comments.
There are no apparent conform, glean or piglit regressions from this change.
(cherry picked from commit 43e4b584227534e30e487e7fb7e99d6501cbcd85)
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 9328f3a670993167d7fb9a590f9e712467e77c7c |
|
20-Jan-2010 |
Luca Barbieri <luca@luca-barbieri.com> |
Fix compressed texture loads for non-minimal pitches again
My commit eea6a7639f767b1d30b6ef1f91a9c49e3f3b78f0 does a memcpy of height
lines, but that's wrong because the texture has a block layout and we
must thus use the number of vertical blocks instead of the height.
Signed-off-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.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
|
| 65d2a266375cf32fd90c7fb77fb87993d3a652ea |
|
20-Jan-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix format logic in compatible_src_dst_formats()
We need to consider the user-requested formats, not the actual device-
chosen formats. See code comments for more details.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 644572a3723bc5167fb71f15e0bbfec3f999be9b |
|
15-Jan-2010 |
Vinson Lee <vlee@vmware.com> |
st/mesa: Remove unnecessary headers from st_cb_texture.c.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| eea6a7639f767b1d30b6ef1f91a9c49e3f3b78f0 |
|
10-Jan-2010 |
Luca Barbieri <luca@luca-barbieri.com> |
Fix compressed texture loads for non-minimal pitches
The current glCompressedTexImage support in the state tracker assumes
that compressed textures have minimal pitch.
However, in some cases this is not true, such as for mipmaps of non-POT
compressed textures on nVidia hardware.
This patch adds a check and does a memcpy for each line instead of the
whole image in that case.
Signed-off-by: Keith Whitwell <keithw@vmware.com>
Tweaks for C90 compilation.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5ac16495a2772886100789f04e1a7d65068e9a40 |
|
05-Jan-2010 |
Brian Paul <brianp@vmware.com> |
Merge branch 'mesa_7_7_branch'
Conflicts:
docs/relnotes.html
src/gallium/drivers/llvmpipe/lp_tex_sample_c.c
src/gallium/drivers/r300/r300_cs.h
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
src/mesa/main/enums.c
|
| 1e414df894fc70b7024eb38c812e582336014974 |
|
04-Jan-2010 |
Michel Dänzer <daenzer@vmware.com> |
st/mesa: Only call st_texture_image_unmap() if texImage->Data is non-NULL.
This was already done in st_TexImage() but was missed between incremental
changes to st_TexSubimage().
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| b1ed72ebe2599ec178f51d86fd42f26486b9a19b |
|
17-Dec-2009 |
Michal Krol <michal@vmware.com> |
Move the remaining format pf_get_* functions to u_format.h.
Previously they depended on format blocks, but after removing those
they started depending on format encoding.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 16c6dce013f089d072256652f012b3b604781bfd |
|
17-Dec-2009 |
Michal Krol <michal@vmware.com> |
Merge branch 'master' into pipe-format-simplify
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
|
| cceeab39ea541b1be1521114316d660a77769c2a |
|
03-Dec-2009 |
Michal Krol <michal@vmware.com> |
Move pf_get_bits/size() to u_format auxiliary module.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 6df42d80234d13676fc3207cf44f0e371e3372b5 |
|
03-Dec-2009 |
Michal Krol <michal@vmware.com> |
Move pf_get_block() to u_format auxiliary module.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 0bed834be4a174d20b31a6cbcf066774bf749929 |
|
03-Dec-2009 |
Michal Krol <michal@vmware.com> |
Move pf_is_depth_and_stencil() to u_format auxiliary module.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| d28740c298968303500a8c43047ded2679e727ac |
|
03-Dec-2009 |
Michal Krol <michal@vmware.com> |
Move pf_is_depth_stencil() to u_format auxiliary module.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 3400b668e35469d5dbba515e3a8b9d775fd2eff5 |
|
03-Dec-2009 |
Michal Krol <michal@vmware.com> |
Move pf_is_compressed() to u_format auxiliary module.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| ac400ffce62be47fc77e8d10cabcd39b92b6c627 |
|
30-Nov-2009 |
Roland Scheidegger <sroland@vmware.com> |
gallium: interface cleanups, remove nblocksx/y from pipe_texture and more
This patch removes nblocksx, nblocksy arrays from pipe_texture (can be
recalculated if needed). Furthermore, pipe_format_block struct is gone
completely (again, contains just derived state).
nblocksx, nblocksy, block are also removed from pipe_transfer, together with
the format enum (can be obtained from the texture associated with the transfer).
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 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
|
| 683e35f726a182ed9fc6b6d5cb07146eebe14dea |
|
19-Nov-2009 |
Keith Whitwell <keithw@vmware.com> |
gallium: don't use arrays for texture width,height,depth
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| dc41d62250ce51f28e94f1d365836ac9f2ff8907 |
|
19-Nov-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: get rid of compressed_num_bytes() code
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 92863109af05acdb4ee5e42141c83ab0f18b7f88 |
|
19-Nov-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove is_compressed_mesa_format()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 273f4d6b5fe125bf0cba44c5ee8b25c76d3396c0 |
|
19-Nov-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove pointless assertion
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4bced42341d13303ae023957d3001a640cf7ea2d |
|
03-Nov-2009 |
Brian Paul <brianp@vmware.com> |
Merge branch 'mesa_7_6_branch'
|
| e60ebebb392d1d4c47541766737b5a79685a24d5 |
|
03-Nov-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: don't use util_blit_pixels_writemask() for depth or depth/stencil
util_blit_pixels_writemask() only works for color formats at this time.
Also, it might never work for depth/stencil surfaces since we can't get
handle stencil values in a fragment shader.
Fixes glCopyTexSubImage(GL_DEPTH_COMPONENT).
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 0197348641614188c400d7c616573bb7f1eea781 |
|
03-Nov-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix tests for depth and depth/stencil texture formats
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 1f196b786d6bd0c6a5dbdc638574ff716cc3d4de |
|
29-Oct-2009 |
Brian Paul <brianp@vmware.com> |
Merge branch 'texformat-rework'
Conflicts:
src/mesa/drivers/dri/radeon/radeon_fbo.c
src/mesa/drivers/dri/s3v/s3v_tex.c
src/mesa/drivers/dri/s3v/s3v_xmesa.c
src/mesa/drivers/dri/trident/trident_context.c
src/mesa/main/debug.c
src/mesa/main/mipmap.c
src/mesa/main/texformat.c
src/mesa/main/texgetimage.c
|
| 11caea687e3f10ae12d33e44edf84635f73047dd |
|
26-Oct-2009 |
Brian Paul <brianp@vmware.com> |
mesa: choose texture format in core mesa, not drivers
Call the ctx->Driver.ChooseTextureFormat() function from core Mesa's
_mesa_[Copy]TexImage functions instead of in the driver functions.
One less thing for drivers to do.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 253e7fee5dc7f0872987b214a6fa162db5e2aa19 |
|
26-Oct-2009 |
Brian Paul <brianp@vmware.com> |
mesa: remove _mesa_compressed_row_stride() calls
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4c00981b22b28141af1442e5a679d0923b4358ae |
|
25-Oct-2009 |
Brian Paul <brianp@vmware.com> |
mesa: remove ctx->Driver.CompressedTextureSize() hook
It always just called _mesa_compressed_texture_size() anyway.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 35efc6a1b3e3dada2cf9bd3a503c1b84f4bcb7f5 |
|
25-Oct-2009 |
Brian Paul <brianp@vmware.com> |
mesa: change compressed texture size calls
Replace calls to ctx->Driver.CompressedTextureSize with calls to
_mesa_format_image_size. The former always called the later.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| bb567357bc1366df7115e0daa68c2470e3bf6ba6 |
|
18-Oct-2009 |
Corbin Simpson <MostAwesomeDude@gmail.com> |
gallium: Permit surface_copy and surface_fill to be NULL.
Uf. Lots of files touched. Would people with working vega, xorg, dri1, etc.
please make sure you are not broken, and fix yourself up if you are.
There were only two or three places where the code did not have painful
fallbacks, so I would advise st maintainers to find less painful workarounds,
or consider overhauling util_surface_copy and util_surface_fill.
Per ymanton, darktama, and Dr_Jakob's suggestions, clear has been left as-is.
I will not add PIPE_CAP_BLITTER unless it is deemed necessary.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 45e76d2665b38ba3787548310efc59e969124c01 |
|
09-Oct-2009 |
Brian Paul <brianp@vmware.com> |
mesa: remove a bunch of gl_renderbuffer fields
_ActualFormat is replaced by Format (MESA_FORMAT_x).
ColorEncoding, ComponentType, RedBits, GreenBits, BlueBits, etc. are
all replaced by MESA_FORMAT_x queries.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| b02ef740b90029bc40629e5b81270a8cf77101d3 |
|
05-Oct-2009 |
Keith Whitwell <keithw@vmware.com> |
mesa/st: add ST_DEBUG environment variable
At last it's possible to turn on tgsi dumps and other debugging in the
state tracker without modifying sources...
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 32aa40eee46fd0b15f3873069f2440ea2dd75408 |
|
02-Oct-2009 |
Brian Paul <brianp@vmware.com> |
mesa: removed gl_texture_image::CompressedSize field
Just call ctx->Driver.CompressedTextureSize() when we need to get
the compressed image size.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4ca9ba254462b9be55b78df1d50519e10b2f4d73 |
|
02-Oct-2009 |
Brian Paul <brianp@vmware.com> |
mesa: move mesa_set_fetch_functions()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| b6bdafdf2cf1110b4a5ca7cf9e1c3dcb124b800f |
|
02-Oct-2009 |
Brian Paul <brianp@vmware.com> |
mesa: remove gl_texture_image::IsCompressed field
Use _mesa_is_format_compressed() instead.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 495628bc5c3879ee759f9a1bc7e2abc720df75a9 |
|
01-Oct-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix non-mipmap lastLevel calculation.
reviewed by Brian Paul.
(cherry picked from master, commit ae2daacbac7242938cffe0e2409071e030e00863)
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| ae2daacbac7242938cffe0e2409071e030e00863 |
|
01-Oct-2009 |
Cooper Yuan <cooperyuan@gmail.com> |
st/mesa: fix non-mipmap lastLevel calculation.
reviewed by Brian Paul.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 1f7c914ad0beea8a29c1a171c7cd1a12f2efe0fa |
|
01-Oct-2009 |
Brian Paul <brianp@vmware.com> |
mesa: replace gl_texture_format with gl_format
Now gl_texture_image::TexFormat is a simple MESA_FORMAT_x enum.
ctx->Driver.ChooseTexture format also returns a MESA_FORMAT_x.
gl_texture_format will go away next.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 6480210b89dc8ae0990c450d27870c7b7930f251 |
|
29-Sep-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: use _mesa_texstore()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 05bad193f56d48384097e37e47fae3fdda85f144 |
|
28-Sep-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: check gl_texture_object::GenerateMipmap field when allocating texmem
In guess_and_alloc_texture() use the gl_texture_object::GenerateMipmap
field as another hint as to whether to allocate space for a whole mipmap.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 8fda97afb8b7a03415dbca6d83691d2d6461126c |
|
28-Sep-2009 |
Brian Paul <brianp@vmware.com> |
Merge branch 'mesa_7_6_branch'
|
| eeb7e04da64fdae3a40b1afdcde71dcded2481f3 |
|
28-Sep-2009 |
Brian Paul <brianp@vmware.com> |
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
|
| e3a6f57ad6c0e7bda5d45eb146194ed39f45abdd |
|
28-Sep-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix/simplify st_texture_object::lastLevel calculation
Don't compute the st_texture_object::lastLevel field based on the texture
filters. Use the _MaxLevel value that core Mesa computes for us.
When called from the GenerateMipmap path, we'll use the lastLevel field
as-is.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| ef089604a9cdcb4efa0850de393e04aa8d002fae |
|
28-Sep-2009 |
Brian Paul <brianp@vmware.com> |
mesa: use texture format functions
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| adce34e23b431e184c4a511464f5cb0281c74db5 |
|
28-Sep-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: use _mesa_get_texstore_func()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| ebf2710b2fd21ae9a6604c015ca7a948589f5a8c |
|
20-Sep-2009 |
Brian Paul <brianp@vmware.com> |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/drivers/dri/intel/intel_clear.c
|
| 82c2f7756af19f0a19aeda7ea1f627262e4561c0 |
|
20-Sep-2009 |
Nicolai Hähnle <nhaehnle@gmail.com> |
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
|
| 08d39251a79a964e4a3ac0d7d8a397c2b66a0808 |
|
16-Sep-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix some incorrect branching/clean-up code in TexImage functions
We need to be sure to call the _mesa_unmap_teximage_pbo() function if we
called _mesa_validate_pbo_teximage().
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| cfa1a0a609daefffc6f8c4087ed0bc34c2665ef4 |
|
16-Sep-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix texture memory allocation bug
The following example caused an incorrect GL_OUT_OF_MEMORY error to be
raised in glTexSubImage2D:
glTexImage2D(level=0, width=32, height=32, pixels=NULL);
glTexImage2D(level=0, width=64, height=64, pixels=NULL);
glTexSubImage2D(level=0, pixels!=NULL);
The second glTexImage2D() call needs to cause the first image to be
deallocated then reallocated at the new size. This was not happening
because we were testing for pixels==NULL too early.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 2914f2b7fd9bd1082f8cce724d234208b900c3d4 |
|
16-Sep-2009 |
Brian Paul <brianp@vmware.com> |
mesa: move generate mipmap calls
Per the suggestion in the Intel driver, move the calls to
ctx->Driver.GenerateMipmap() into core Mesa so that drivers don't
have to worry about it.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5a8e1ddf193bb25c5cf05b70088c64ede772d7e9 |
|
03-Sep-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: silence uninitialized var warnings
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 8fc945cd847aa5d343a5f76eb2f9f2c9075cccdd |
|
02-Sep-2009 |
Keith Whitwell <keithw@vmware.com> |
st/mesa: Do GL_RGBA->GL_RGB texsubimage on hardware
State tracker currently backs GL_RGB textures with RGBA almost always.
This means we need to maintain A==1 in these textures to give correct GL_RGB
sampling results.
This change offloads the RGBA->RGB copy to hardware using the new writemask
version of u_blit_pixels.
More src/dstLogical/dstActual triples could be shifted to hardware by
this technique in future patches.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 67c286d20e6f1256950d81aab3f6b54cd4926602 |
|
03-Sep-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: silence uninitialized var warnings
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 1b448c7a5cafa68eeead2a4c45f4362a9883383b |
|
03-Sep-2009 |
Brian Paul <brianp@vmware.com> |
mesa: consolidate PBO map/unmap helpers
Instead of _mesa_map_readpix_pbo() use _mesa_map_pbo_source().
Instead of _mesa_map_drawpix_pbo() and _mesa_map_bitmap_pbo() use
_mesa_map_pbo_dest().
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| e79054cc4090a2be346236236c9e18ae85cad43d |
|
02-Sep-2009 |
Keith Whitwell <keithw@vmware.com> |
st/mesa: Do GL_RGBA->GL_RGB texsubimage on hardware
State tracker currently backs GL_RGB textures with RGBA almost always.
This means we need to maintain A==1 in these textures to give correct GL_RGB
sampling results.
This change offloads the RGBA->RGB copy to hardware using the new writemask
version of u_blit_pixels.
More src/dstLogical/dstActual triples could be shifted to hardware by
this technique in future patches.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 54a7115fc27c640e2b3f1a362e8e07aac220556d |
|
06-Aug-2009 |
Chia-I Wu <olvaffe@gmail.com> |
mesa/st: Add support for binding pipe surface to texture.
This commit adds functions to bind a pipe surface to a texture. This
allows texturing directly from the surface.
Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c1785c19ca0716a7e85777242949a0c33e28988f |
|
01-Aug-2009 |
Patrice Mandin <patmandin@gmail.com> |
mesa st: Move logbase2 function to util/u_math.h
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a7427b0f7b2325b8dcc560d57cb894df25ebef93 |
|
27-Jul-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: silence warning
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| d4e6df9ab6e7b707278e3739abee776418c6f527 |
|
16-Jul-2009 |
José Fonseca <jfonseca@vmware.com> |
mesa: Fix logbase2.
It was providing 1 too many for non power two values.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4ed1de8b84b587d2be0c0e4ecb6b5f421195f562 |
|
07-Jul-2009 |
José Fonseca <jfonseca@vmware.com> |
mesa: Report the true face number when flushing.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 71633abafc935c25da9731bab48c228ceb9b4097 |
|
07-Jul-2009 |
Michel Dänzer <daenzer@vmware.com> |
gallium: Fixes for clobbering stencil values in combined depth/stencil textures.
Also fix one case where a 32 bit depth value was incorrectly converted to a
combined depth/stencil value.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 2a2236606fd6ae473a2f4db6ef6d3d5030261316 |
|
02-Jul-2009 |
José Fonseca <jfonseca@vmware.com> |
mesa: Assume depth textures have a single level unless told otherwise.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 578230dbbffbf5317d6002d1023dcd62b57186f5 |
|
30-Jun-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
st/gl: Add stubs for CompressedTexSubImage[1D|3D]
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a4fd94a54a75a3418462c30f1240ab50b5f24090 |
|
30-Jun-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
st/gl: Add support for glCompressedTexSubImage
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 503632557e8904b775e1b6f3f84eb41bda3af122 |
|
14-May-2009 |
Keith Whitwell <keithw@vmware.com> |
mesa/st: restore flush to copy_texsubimage (was previously finish)
Need a flush here even though the original finish was overkill.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f989390af6f827d1ea36560381340148811836f3 |
|
13-May-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
st/gl: Fix mip gen for compressed textures
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| e90beb93a89f77bffce8ab3d54457ea65868e93c |
|
07-May-2009 |
Keith Whitwell <keithw@vmware.com> |
mesa/st: keep surface_copy arguments positive
The src/dest x,y, and w,h arguments of the pipe->surface_copy
function are unsigned and the drivers aren't expecting negative
(or extremly-large unsigned) values as inputs. Trim the requests
at the state-tracker level before passing down.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 507f4e7a7448fb246febefe8819b7b3ac70a35b4 |
|
07-May-2009 |
Keith Whitwell <keithw@vmware.com> |
mesa/st: remove redundant call to st_finish in CopyTexSubImage
Rendering should already have been flushed, any synchronization will
be done by the driver or memory manager.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| afd16512bc354cf1a7220cb9bf3ce445503c7af4 |
|
27-Apr-2009 |
Keith Whitwell <keithw@vmware.com> |
mesa/st: workaround for crashes in st_copy_texsubimage
Proper fix for this hasn't been identified, but avoid crashing.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5ed7764fd6354da8e2be15d6fb724c2d6be9be4a |
|
27-Apr-2009 |
Keith Whitwell <keithw@vmware.com> |
mesa/st: fix incorrect face, level in compress_with_blit
We were incorrectly applying the destination texture face and level
when requesting a transfer to the temporary texture, which has only
one face and level. This would obviously cause problems uploading to
compressed cube and mipmap textures.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 01397a66c77f8ebfe78b90ace59c095194a290cf |
|
20-Apr-2009 |
José Fonseca <jfonseca@vmware.com> |
mesa: Handle failure to create a transfer.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| e50dd26ca6d0eb0d0f97c2780020ea16e3d4a687 |
|
17-Apr-2009 |
Thomas Hellstrom <thellstrom-at-vmware-dot-com> |
gallium: Create OGL state tracker wrappers for various CPU access operations.
There are two usage types of buffer CPU accesses:
One where we try to use the buffer contents for multiple draw commands in
a batch. (batch := sequence of commands that are flushed together),
like incrementally adding bitmaps to a bitmap texture that is reallocated
on flush.
And one where we assume we can safely overwrite the old buffer contexts, like
glTexSubImage. In this case we need to make sure all old drawing commands
referencing the buffer are flushed before we map the buffer.
This is easily forgotten.
Add wrappers for the most common of these operations. The first type is
prefixed with "st_no_flush" and the second type is prefixed with
"st_cond_flush", where "cond" indicates that we attmpt to only flush
if there is indeed unflushed draw commands referencing the buffer.
Prefixed functions are
screen::get_tex_transfer
pipe_buffer_write
pipe_buffer_read
pipe_buffer_map
Please use the wrappers whenever possible.
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| e80d1e367a25af406c7f2327646c0aa699962fe8 |
|
16-Apr-2009 |
José Fonseca <jfonseca@vmware.com> |
Merge branch 'gallium-s3tc'
|
| 255c33d733cc4d2d7483d903513fdc9c34c90f0d |
|
15-Apr-2009 |
Brian Paul <brianp@vmware.com> |
st: remove XXX comment
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 7b24e58a0ca571d6230ef5076ea352253b81fe6e |
|
15-Apr-2009 |
Brian Paul <brianp@vmware.com> |
st: check for fast memcpy path in decompress_with_blit()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 51b339af2e8b80575a24bb9146f031c9605180bb |
|
15-Apr-2009 |
Brian Paul <brianp@vmware.com> |
st: decompress_with_blit() path for glGetTexImage().
Decompress a texture by rendering a textured quad.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 9b75627fab5bf2ea90f27ddd31b60c54895f6de6 |
|
15-Apr-2009 |
Thomas Hellstrom <thellstrom-at-vmware-dot-com> |
gallium: Make sure we flush before some texture / buffer operations.
Also implement context member functions to optimize away those
flushes whenever possible.
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 1ea7f0fef055245fa18c0fbc3e54a866956c2507 |
|
14-Apr-2009 |
José Fonseca <jfonseca@vmware.com> |
mesa: Fix gcc assembly enable logic.
The i386 symbol is defined on WINDDK.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 311f77198e171e9ce8ddcce91fd6a894fff1f14f |
|
09-Apr-2009 |
Brian Paul <brianp@vmware.com> |
st: remove another unneeded 'is compressed' comparison
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f12201567463c7aeb9b76c32f000d577a82e7f92 |
|
09-Apr-2009 |
Brian Paul <brianp@vmware.com> |
st: remove comp_byte parameter to st_texture_create()
We can determine if the texture is compressed by checking the format.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 1ad2484f03cbe9ae6bd4ebe50d6894e570d65952 |
|
09-Apr-2009 |
Brian Paul <brianp@vmware.com> |
st: consolidate format->usage computation
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| eaca19edbbe7876079aa33d7f75d93601677081b |
|
09-Apr-2009 |
Brian Paul <brianp@vmware.com> |
st: add const qualifiers, use GL types
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| d11d903c1b81000d04f859dcc2da41dae024f146 |
|
09-Apr-2009 |
Brian Paul <brianp@vmware.com> |
st: make loops over 3D texture slices a litte more intuitive
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5facd7986ace899673499f396897469720476799 |
|
09-Apr-2009 |
Brian Paul <brianp@vmware.com> |
st: reformatting and clean-ups in texture code
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 55ed2a73653fb2fb9dee36c729c09177df2d5b4e |
|
08-Apr-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
st: If the hw supports it do hw conversion of texture uploads
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 105758105a790dd8466c6be8c232c3f215ca4dee |
|
08-Apr-2009 |
Brian Paul <brianp@vmware.com> |
st: implement glCopyTexImage() for GL_DEPTH24_STENCIL8 internal format
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a4bec69e7271eda0137874973aa8c7d44175fedf |
|
04-Apr-2009 |
Brian Paul <brianp@vmware.com> |
mesa: move glGetTexImage(), glGetCompresssedTexImage() code into new file
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 2002e03a5232c54988161cb629966bdce19d35de |
|
26-Mar-2009 |
Brian Paul <brianp@vmware.com> |
st: init the default texture to (0,0,0,1)
The default texture is used when a sampler uses an incomplete texture.
This change fixes the piglit fp-incomplete test.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| d7b7b63bd7cca80e99ad9701f8b56ee365053647 |
|
21-Mar-2009 |
Michal Krol <michal@vmware.com> |
st: Silence compiler warnings.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 9e84e7def152aa8080da59a78795d6434e687403 |
|
18-Mar-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
st/gl: Only transfer needed parts in st_TexSubimage
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 0b0e2159f2e9e9278c058d06387948f54e537d08 |
|
18-Mar-2009 |
Brian Paul <brianp@vmware.com> |
st: need to free/realloc pipe texture when we're handed image level > last_level
Fixes progs/tests/tri-fbo-tex-mip.c
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a0509f7d28765c6ef8546eafba94aec46d9e7ed3 |
|
18-Mar-2009 |
Brian Paul <brianp@vmware.com> |
st: clean up some if-statment code
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f500f3a72c6be61ff9b8e1166f734e408d00aded |
|
13-Mar-2009 |
Jakob Bornecrantz <jakob@vmware.com> |
gallium: Remove do_flip argument from surface_copy
I should have gotten most uses and implementation
correctly fixed, but things might break.
Feel free to blame me.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 799f55803d15602b10d2bb97ff62792f05ce4de3 |
|
07-Mar-2009 |
Brian Paul <brianp@vmware.com> |
gallium: use unsigned long to silence warnings with 64-bit build
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5e27cd46c04a9e7b5904cc014bffd0f4daae31fe |
|
04-Mar-2009 |
Michel Dänzer <daenzer@vmware.com> |
gallium: Unify reference counting.
The core reference counting code is centralized in p_refcnt.h.
This has some consequences related to struct pipe_buffer:
* The screen member of struct pipe_buffer must be initialized, or
pipe_buffer_reference() will crash trying to destroy a buffer with reference
count 0. u_simple_screen takes care of this, but I may have missed some of
the drivers not using it.
* Except for rare exceptions deep in winsys code, buffers must always be
allocated via pipe_buffer_create() or via screen->*buffer_create() rather
than via winsys->*buffer_create().
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f2c023291a1f2887294d2aac504f8b82857ad092 |
|
22-Feb-2009 |
Brian Paul <brianp@vmware.com> |
mesa: move a bunch of compiler-related stuff into new compiler.h header
This trims down and cleans up imports.h and glheader.h quite a bit.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 59d54334c96f44ed1d8bf660dc96221362a77d04 |
|
16-Feb-2009 |
Keith Whitwell <keithw@vmware.com> |
Merge branch 'master' into gallium-texture-transfer
Conflicts:
src/mesa/state_tracker/st_cb_accum.c
src/mesa/state_tracker/st_cb_drawpixels.c
|
| 7c8836e9ef49d938aa55a1c385b95c6371c301f1 |
|
13-Feb-2009 |
Michel Dänzer <daenzer@vmware.com> |
gallium: Various coordinate fixups for texture transfers.
Fixes glReadPixels, gl(Copy)TexSubImage, glCopyPixels.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f1a59a6dd7b7b0523db191d82b3af1a841c6475d |
|
12-Feb-2009 |
Brian Paul <brianp@vmware.com> |
mesa: use new ST_CALLOC_STRUCT() macro in gallium state tracker
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| dc6cc4f9da25725d0b8f6efe571a5430fb399de5 |
|
10-Feb-2009 |
José Fonseca <jfonseca@vmware.com> |
mesa: Compare formats using nominal bytes per pixel.
This is a temporary fix which works for the formats we care so far. The
real fix would be abandon the concept "nominal bytes per pixel" entirely
in Mesa, and use macropixels instead, as done in gallium interfaces
already.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4617981ec72f7985941bee4b03c534d97ff96bc6 |
|
05-Feb-2009 |
Michel Dänzer <daenzer@vmware.com> |
gallium: No longer allow CPU mapping surfaces directly.
Instead, a new pipe_transfer object has to be created and mapped for
transferring data between the CPU and a texture. This gives the driver more
flexibility for textures in address spaces that aren't CPU accessible.
This is a first pass; softpipe/xlib builds and runs glxgears, but it only shows
a black window. Looks like something's off related to the Z buffer, so the
depth test always fails.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 87a6fe57e85ea5f273e808211a0e61d2b837b8e2 |
|
17-Oct-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
progs/trivial/tri.c
|
| 8d6ef125ac6044438db5b89d6d310ccfc4b8140a |
|
17-Oct-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: fix mis-matched malloc/free vs. aligned malloc/free
Use aligned malloc/free for teximage data everywhere to be consistant.
The mismatch didn't make any difference when HAVE_POSIX_MEMALIGN was defined.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| d7f1cb5b5a134b63227d5746a2dd1f05597c5c2f |
|
10-Oct-2008 |
Keith Whitwell <keith@tungstengraphics.com> |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/auxiliary/gallivm/instructionssoa.cpp
src/gallium/auxiliary/gallivm/soabuiltins.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.c
src/gallium/auxiliary/rtasm/rtasm_x86sse.h
src/mesa/main/texenvprogram.c
src/mesa/shader/arbprogparse.c
src/mesa/shader/prog_statevars.c
src/mesa/state_tracker/st_draw.c
src/mesa/vbo/vbo_exec_draw.c
|
| d055b2c001a0fb233f98c10d124b43dd2448059e |
|
07-Oct-2008 |
Brian <brian.paul@tungstengraphics.com> |
mesa: fix convolve/convolution mix-ups
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 47bf26845712bea756526fc159bdb355ceaef9c2 |
|
26-Sep-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
mesa: remove const qualifiers to match device driver interface function
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 8d249ca620f6995cc5824d95c29bda7043bbdf8c |
|
18-Sep-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: if we run out of memory in st_TexImage, flush and try again.
If the driver buffers a scene flushing should release old textures and
make space for new ones. Fixes problem with texdown.c test.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 66682651b622be201b211d50c7311e0b81b2b4a5 |
|
17-Sep-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: need to finish, not flush, in st_copy_texsubimage()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 37607aeaf8b0fd35213635ba1c3743b6e059d48f |
|
16-Sep-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: fix glTexImage(width=height=depth=0) case
Free old teximage/level data, then stop.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 9d9143d88985e69835b374ff330bab929275d68e |
|
01-Sep-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: move st_texture_image() cast wrapper to header file
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4f25420bdd834e81a3e22733304efc5261c2998a |
|
25-Aug-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: refactor/replace p_util.h with util/u_memory.h and util/u_math.h
Also, rename p_tile.[ch] to u_tile.[ch]
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 145a45e9d6807add8229f1fc9c63fbb6951b1b88 |
|
18-Aug-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: fix do_flip bug on glCopyTexImage / surface_copy() path
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a7b818d53a95b549bbff942a9cb91272e0799dd5 |
|
14-Aug-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: init default texture image to gray
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 8f6d9e12be0be086ca2aab0b56dff8d2181addd9 |
|
14-Aug-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: use a default texture in update_textures(), update_samplers() when needed
The default texture is used when the current fragment shader has texture
sample instructions but the user has not provided/bound a texture.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f3048ad90ed2e4583f0f7aaf35a0f4aa581942dd |
|
13-Aug-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: in fallback_copy_texsubimage() create new tex surface for CPU read access
Was trying to use the strb->surface but it's made for GPU read/write only.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 27858226dc4eb3e64d980ba8530c2fd2e39218cf |
|
08-Aug-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: fix additional glCopyTex[Sub]Image issues
Use the TexFormat->StoreImage() routine for fallbacks. This handles the
case of copying RGBA framebuffer data into an RGBA texture when the base
format is GL_RGB (or GL_LUMINANCE, etc). In that case, we need to set
the texture's alpha=1 and override the framebuffer's alpha.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4e070f10c0a2af8a563eadf7fdb09b11d9067a99 |
|
08-Aug-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: clean-up, remove dead code, update comments
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 275b09f2569c8bea5dcca1643c93aa6a43d7e2a2 |
|
07-Aug-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: fix a few bugs on the fallback CopyTex[Sub]Image() path.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 8aafc03b260ab8923f1b373f7effa75bcdb40a72 |
|
18-Jul-2008 |
José Fonseca <jrfonseca@tungstengraphics.com> |
gallium: Finer grained is_format_supported.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 6c534b830c6f5427c391c5225c34561141c201ba |
|
15-Jul-2008 |
Michal Krol <michal@tungstengraphics.com> |
st: Silence compiler warnings on Windows.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 36dd89c8a7f2a911e8f7f18d1edcaf982a75a438 |
|
13-Jul-2008 |
José Fonseca <jrfonseca@tungstengraphics.com> |
util: Eliminate pipe from the arguments to pipe_get/put_tile_xxx functions.
You don't need a pipe_context * for this, and all other necessary info is
already inside pipe_surface.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4ddd65967915ca4846f2831bc676c878a29dae4a |
|
27-Jun-2008 |
José Fonseca <jrfonseca@tungstengraphics.com> |
gallium: Drop pipe_texture->cpp and pipe_surface->cpp.
The chars-per-pixel concept falls apart with compressed and yuv images,
where more than one pixel are coded in a single data block.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 89e9d6b6db933c870443714c3d7c9539d117cddf |
|
24-Jun-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: added support for fixed-point formats, drawing
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a479bf62353b6517841e620122112e7565d2391c |
|
23-Jun-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: fix-up inverted do_copy_texsubimage()
The logic/arithmetic for inverting the src image is a bit simpler now.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 81b1a4224de1992d25ada006f54ff9147aa82da3 |
|
23-Jun-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: remove dead/prototype code
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5b51cc020efc5519bc7cc34f6fcb4138eab76e0a |
|
13-Jun-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: add some #if FEATURE_x tests
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| b19e8f720bb2f4d360f5497b64901fc48321f172 |
|
12-Jun-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: test for FEATURE_convolution
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 54fbd8bbd4e5a484d59907bae852908e3a8b8f3c |
|
19-May-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
Merge branch 'gallium-0.1' into gallium-tex-surfaces
|
| f8dce51083042b4d3fabf48524835290b6725682 |
|
17-May-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: ref counting clean-ups
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a1f95a8bf64f863289b6759caeec76d7e054400e |
|
09-May-2008 |
Roland Scheidegger <sroland@tungstengraphics.com> |
gallium: depth textures have usage depth_stencil instead of render_target
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 2a39dbe7364af5444b1eb43650dfc31ed09257dc |
|
09-May-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: fix out of tex memory crashes
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 1a82d9648b3db780e58e4966924157542d148c58 |
|
08-May-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: fix some render to texture bugs
Before, we were sometimes rendering into a stale texture because
st_finalize_texture() would discard the old texture and create a new one.
Moved st_update_framebuffer atom after texture validation so that we
can create a new renderbuffer surface if the texture changes.
Also, split texture validation into two parts: finalize_textures and
update_textures. Do finalize_textures first to avoid getting into the
situtation where we're doing a pipe->surface_copy() mid-way through
state validation.
Some debug code still in place, but disabled...
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 79931e38abc62286151121a3f59127e296144551 |
|
07-May-2008 |
Michel Dänzer <michel@tungstengraphics.com> |
Revert "gallium: move setup of dest_surface in do_copy_texsubimage()"
This reverts commit f7dbd18371f9cb6686b6a97642b3ca5577e83472.
Looks like an accidental revert of commit
650c57f19398800dfdcf357b6e9ec7b68bfa34f1.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 6b0fd0f1572cd6af1e931b70f75852de25d32649 |
|
06-May-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: re-enable temporarily disabled code in do_copy_texsubimage()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 296378b6c8b205048244746e260739448c4ee590 |
|
06-May-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: create drawing surfaces as GPU_READ/WRITE only
Create different temporary surfaces for CPU_READ/WRITE when needed (such as
for glReadPixels, glAccum, some glCopy/DrawPixels, glCopyTexSubImage, etc).
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f7dbd18371f9cb6686b6a97642b3ca5577e83472 |
|
06-May-2008 |
Michal Danzer <michel@tungstengraphics.com> |
gallium: move setup of dest_surface in do_copy_texsubimage()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 66f703dca938f7749edc717fd8f690aba2d6e936 |
|
06-May-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: change calculate_first_last_level() to match gallium-tex-surfaces branch
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 809dd9089bae70cf35cea6a75258e700e7455738 |
|
06-May-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: sync up texture/sampler changes with master
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| d0279fc4b38c72356a341173317bcd45d9093f45 |
|
06-May-2008 |
Michel Dänzer <michel@tungstengraphics.com> |
gallium: Make sure to release texture surfaces (at the right time).
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 650c57f19398800dfdcf357b6e9ec7b68bfa34f1 |
|
06-May-2008 |
Michel Dänzer <michel@tungstengraphics.com> |
gallium: glCopyTexSubImage improvement.
Only get a texture surface for attempting an accelerated copy, and mark it for
GPU use only.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 09e6be9b5782870f1f225653687e0d3e7be2a5a9 |
|
06-May-2008 |
Keith Whitwell <keith@tungstengraphics.com> |
Merge commit 'origin/gallium-0.1' into gallium-tex-surfaces
Conflicts:
src/mesa/state_tracker/st_atom_sampler.c
src/mesa/state_tracker/st_cb_texture.c
|
| ffde4e03cf178719c06c300939f8f469d7fc5e9c |
|
04-May-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: fix some BaseLevel, lastLevel bugs
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| ce509401738e7073de94a2b7fc41461c52a73da0 |
|
02-May-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: minor code, comments clean-up
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 479d19f5a2bca79104f3b7f94147e94a52a27fea |
|
02-May-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: in st_finalize_texture() check texture dimensions
Check dimensions in addition to target, format, etc.
Fixes a bug where we failed to detect a change in texture image sizes and
wound up using the old texture data.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a73ae3d5eb8419feab5aea26573aa41b72f941eb |
|
02-May-2008 |
Keith Whitwell <keith@tungstengraphics.com> |
gallium: Add texture usage flags, special-case allocation of display targets
For many envirionments it's necessary to allocate display targets
in a window-system friendly manner. Add facilities so that a driver
can tell if a texture is likely to be used to generate a display surface
and if use special allocation paths if necessary.
Hook up softpipe to call into the winsys->surface_alloc_storage()
routine in this case, though we probably want to change that interface
slightly also.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| d4074c509b5d28be0a2ec51d40329e1aed7047ef |
|
02-May-2008 |
Michel Dänzer <michel@tungstengraphics.com> |
gallium: Reallocate pipe_texture in st_TexImage if the texture object was used.
Fixes problems with interleaved glTexImage and rendering calls.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c3a8a41faabed4c9b84a6fbaf7a86a089b8fcbba |
|
02-May-2008 |
Keith Whitwell <keith@tungstengraphics.com> |
Merge branch 'gallium-0.1' into gallium-tex-surfaces
|
| de7277f81a0f4330f11ec429bf46e93d0a748dfe |
|
01-May-2008 |
Michel Dänzer <michel@tungstengraphics.com> |
gallium: Set sampler->min_lod instead of always reallocating pipe_textures.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c9ed86a96483063f3d6789ed16645a3dca77d726 |
|
01-May-2008 |
Keith Whitwell <keith@tungstengraphics.com> |
gallium: tex surface checkpoint
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 21989edd55409d72ee55187f4f9062496ca3fbf8 |
|
01-May-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: fix texture border removal bug
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| cc94863429d8a6cef8dbf861e78701a458d30f5a |
|
29-Apr-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: fix broken GL_DEPTH_COMPONENT case in fallback_copy_texsubimage()
Also, make sure surfaces are suitable for blitting before calling util_blit_pixels().
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c2497879f127251994064a0e0c24901782adae9e |
|
28-Apr-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: fix incorrect level param in copy_image_data_to_texture()
This fixes a weird conform test failure that depended on something that
happened several tests earlier. This took waaaaaay too long to find/fix.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4c50969334844bc9aa622176c3ebcbc733394f78 |
|
25-Apr-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: added null ptr check
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 9b44f5a7550d8ede2eda763770e927df4c15cc8e |
|
25-Apr-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: added a null ptr check
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 3c0dc8242b64518d5635263ba65b39afa919dd86 |
|
25-Apr-2008 |
Michel Dänzer <michel@tungstengraphics.com> |
gallium: Use util_blit_pixels() for glCopyTexSubImage when appropriate.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 02250c855fbec5299a2d6118fefa0523ec73654c |
|
11-Apr-2008 |
Michel Dänzer <michel@tungstengraphics.com> |
gallium: Flush render cache at the beginning of fallback_copy_texsubimage().
It may get stale bits otherwise.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f32c51277498887b348133ebcd947dbc8acce756 |
|
04-Apr-2008 |
Roland Scheidegger <sroland@tungstengraphics.com> |
gallium: state tracker fixes for compressed textures
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 45cc35e77600af8628393475405160e26d56d421 |
|
25-Mar-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: fix a few texture border/mipmap glitches found w/ conform
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 3b3774b1227743147159676795b542c0eb7c2bdf |
|
21-Mar-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: catch some out of memory conditions in the texture image code.
st_finalize_texture()'s return code now indicates success/fail instead of
presence of texture border (which we discard earlier).
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4984487bc3338fc351a0631eaa4515e4adbb86a9 |
|
20-Mar-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: add face, dirtyLevels params to pipe->texture_update()
This provides better information about which images in texture object have changed.
Also, call texture_update() from more places previously missed.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 7585b4ceb8fed862c07f50af8030a6f0eb8a8321 |
|
04-Mar-2008 |
Brian <brian.paul@tungstengraphics.com> |
gallium: disable an unneeded assertion (hit with texwrap.c)
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 6f715dcc219071e574e363a9db4365c9c31ebbd3 |
|
27-Feb-2008 |
Brian <brian@i915.localnet.net> |
gallium: remove pipe_context->texture_create/release/get_tex_surface()
These functions are now per-screen, not per-context.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4da19dbcaa9f3e2d20fffd0145bf0bc756dd7542 |
|
27-Feb-2008 |
Brian <brian@i915.localnet.net> |
gallium: remove pipe parameter from pipe_texture_reference()
Added pipe field to pipe_texture (temporary, see comments).
First step toward context-less texture creation...
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 1d45787d4a70c55e7fa899d13b9139430e2fa3e2 |
|
20-Feb-2008 |
Brian <brian.paul@tungstengraphics.com> |
gallium: mark texture object data dirty in do_copy_texsubimage()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 3ccbaa977f96eaa849093875dd0944f744ee1e21 |
|
20-Feb-2008 |
Brian <brian.paul@tungstengraphics.com> |
gallium: re-enable GenerateMipmap calls
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 58edb0683db45c449b219988a8715cf8fd69e42d |
|
20-Feb-2008 |
Brian <brian.paul@tungstengraphics.com> |
gallium: state tracker didn't always notify drivers of texobj data changes
Calling glTexSubImage() or glTexImage() to replace texture data didn't
reliably cause pipe->set_sampler_texture() to get called so drivers didn't
always get notified of new texture data.
The st_texture_object->pt pointer doesn't always indicate changed data so
added a dirtyData field.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 6acd63a4980951727939c0dd545a0324965b3834 |
|
15-Feb-2008 |
José Fonseca <jrfonseca@tungstengraphics.com> |
Code reorganization: update build.
Update the Makefiles and includes for the new paths.
Note that there hasn't been no separation of the Makefiles yet, and make is
jumping all over the place. That will be taken care shortly. But for now, make
should work. It was tested with linux and linux-dri. Linux-cell and linux-llvm
might require some minor tweaks.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| e922adbe1d6c1764968377658ea92ae6de0585db |
|
13-Feb-2008 |
Michel Dänzer <michel@tungstengraphics.com> |
gallium: pipe->surface_copy can flip the contents vertically when necessary.
Fixes gears being upside down on the box in demos/gearbox.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 508b73289de5c4e16b31ae7267140efbb0f319a5 |
|
13-Feb-2008 |
Brian <brian.paul@tungstengraphics.com> |
gallium: remove dead code
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a34b43b3f4817268ef4b3f186203b5fbafc7214e |
|
13-Feb-2008 |
Brian <brian.paul@tungstengraphics.com> |
gallium: added null ptr check
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 1d62a057bcb3ee4ef6ebedd93f62ed2e0d8061ba |
|
12-Feb-2008 |
Brian <brian.paul@tungstengraphics.com> |
gallium: remove unused first_level param from st_texture_create()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 4da1cdf78fa3b954840650fa46cf72da5daf149f |
|
12-Feb-2008 |
Brian <brian.paul@tungstengraphics.com> |
gallium: clean-up, simplification of mipmapped textures
Remove pipe_texture->first_level (always implicitly zero). This means there's
never any unused mipmap levels at the top.
In the state tracker, we no longer re-layout mipmapped textures if the
MinLod/MaxLod texture parameters change. It's up to the driver to obey the
pipe_sampler->min/max_lod clamps.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 212b27d33f94eeb25ba9cbc58f9e41295a29d2c9 |
|
11-Feb-2008 |
Brian <brian.paul@tungstengraphics.com> |
gallium: strip borders from textures passed to st_TexImage.
Manipulate the unpack params to skip the border. Gallium drivers won't support
texture borders.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| cfe9e66f2bc596c43760911e7c1604bb32cdee28 |
|
11-Feb-2008 |
Brian <brian.paul@tungstengraphics.com> |
gallium: use _mesa_tex_target_to_face()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 62abcb9aacc33218d0143a743c738435794b32a9 |
|
08-Feb-2008 |
Brian <brian.paul@tungstengraphics.com> |
gallium: initial implemenation of auto mipmap generation in state tracker
Use hardware rendering to compute/render mipmap levels.
The fallback path (which will be used for non-renderable texture formats)
isn't working yet.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f52f5136e6eed23e55098681e5b082cc452136d6 |
|
06-Feb-2008 |
Brian <brian.paul@tungstengraphics.com> |
clean-ups in guess_and_alloc_texture()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 2440ff74d69a8caf49b05a960b4c7e282a96565e |
|
06-Feb-2008 |
Brian <brian.paul@tungstengraphics.com> |
plug in ctx->Driver.GenerateMipmap function
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| afc54983370033b65e3a7cbb29bd9c87156f0881 |
|
06-Feb-2008 |
Brian <brian.paul@tungstengraphics.com> |
clean-ups
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 2014e0bacbd2661bf98d084120a109b1c0bf0df2 |
|
14-Jan-2008 |
Michel Dänzer <michel@tungstengraphics.com> |
Remove pipe->get/put_tile_rgba.
pipe_get/put_tile_rgba() now use pipe->get/put_tile internally.
Also simplify the <format>_get/put_tile_rgba() helper functions and clean up
some inconsitencies in them.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c76efb96b405e43e3261d1dc9e8812fdb2cfbac8 |
|
10-Jan-2008 |
Michel Dänzer <michel@tungstengraphics.com> |
Remove mapping fields from struct pipe_surface.
It's now the responsibility of surface users to keep track of their mappings.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 1c5f27a18b775b3784fcd265d60e0affa0b31581 |
|
04-Jan-2008 |
Michel Dänzer <michel@tungstengraphics.com> |
gallium: Make texture target an enum for better debuggability.
Also make enum pipe_format used in a couple more places.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 88723b2fc84628c1bc1e0008b88602b85e8668be |
|
11-Dec-2007 |
Michel Dänzer <michel@tungstengraphics.com> |
Remove internal_format field from struct pipe_texture.
It's state tracker specific / not really necessary anyway.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c3af68dc5022715cc8f126b7df12f3f5248aefe7 |
|
11-Dec-2007 |
Keith Whitwell <keith@tungstengraphics.com> |
gallium: remove set_sampler_units interface
The effect of this mapping can be acheived by the state tracker and
setting up the pipe texture state pointers to incorporate its affects.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 89afc929f4e18165f1043c36844150e78f300cd5 |
|
11-Dec-2007 |
Keith Whitwell <keith@tungstengraphics.com> |
gallium: remove dead pbo zcopy code
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5823f99d0fbc054b87aeb1bc15d413d3eadd27a8 |
|
07-Dec-2007 |
Brian <brian.paul@tungstengraphics.com> |
fix void pointer arithmetic warnings
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| b859cdf6f191b4d8b56537c8dc30082a7e2d94b3 |
|
07-Dec-2007 |
Michel Dänzer <michel@tungstengraphics.com> |
Eliminate struct pipe_region.
Directly use struct pipe_buffer_handle for storage and struct pipe_surface for
(un)mapping.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 987d59bb83e9e08192563e5f1b52949c5511053c |
|
06-Dec-2007 |
Michel Dänzer <michel@tungstengraphics.com> |
Remove remnants of 'intel' from active state tracker code.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 753db0d8407147393a7b0622ae3fa28f68d0353d |
|
30-Nov-2007 |
Michel Dänzer <michel@tungstengraphics.com> |
Hide texture layout details from the state tracker.
pipe->get_tex_surface() has to be used for access to texture image data.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 11a80160fd60d1eb1541b49128c659526a5d8ac8 |
|
28-Nov-2007 |
Michel Dänzer <michel@tungstengraphics.com> |
Move dimensions from struct pipe_region to struct pipe_surface.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f8549e8f4f8bdfebcb4e0a2754df59b3fe4fdff7 |
|
01-Nov-2007 |
Brian <brian.paul@tungstengraphics.com> |
plug in _mesa_test_proxy_teximage, temporarily
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| ee80e0b620c5b9af62dac8ad64a84042b46f5264 |
|
26-Oct-2007 |
Brian <brian.paul@tungstengraphics.com> |
Move the get/put_tile() functions to pipe_context.
The _rgba versions are temporary until the state tracker is updated.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5cb0d749b07be4ecbf4d4d7cde18aecdfe2dba38 |
|
17-Oct-2007 |
Brian <brian.paul@tungstengraphics.com> |
formatting fix
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 28b315dc1aed36bebadfacbd55e481e7baacfcb5 |
|
28-Sep-2007 |
Brian <brian.paul@tungstengraphics.com> |
comments
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| e0271e16da6427436ed755f170e9b402ada5dd7c |
|
27-Sep-2007 |
keithw <keithw@keithw-laptop.(none)> |
remove dead code
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5c83f1371978472fbe4bba8f686733c6b519874a |
|
27-Sep-2007 |
Brian <brian.paul@tungstengraphics.com> |
Do image flipping in do_copy_texsubimage() and GL pixel transfer ops (except convolution).
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| c6717a86420d7141013165f7acd50b3c3f751756 |
|
27-Sep-2007 |
Brian <brian.paul@tungstengraphics.com> |
fallback_copy_texsubimage() basically works now (at least w/ Xlib driver).
Have to map regions before calling get_tile()/put_tile().
Need to invert srcY of glCopyTexSubImage() depending on renderbuffers
up/down orientation.
Still need to invert image in fallback_copy_texsubimage() when needed.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 038cb561eb094af2f2ba06e18e61246fc0c87c3c |
|
27-Sep-2007 |
Brian <brian.paul@tungstengraphics.com> |
More work on glCopyTexSubImage.
Start sketching out a fallback path based on surface->get_tile(), put_tile()
which will do format convertion and GL's pixel transfer ops.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| b27498c7cad7dae4e3b3ef9517b9c0aef58f73f6 |
|
27-Sep-2007 |
Brian <brian.paul@tungstengraphics.com> |
checkpoint: glCopyTexImage work
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5578f8ce3bf349107b04fb0ebb8b8d505bd9424d |
|
17-Sep-2007 |
Keith Whitwell <keith@tungstengraphics.com> |
Remove non-meaningful region_idle() interface
This is already handled by the semanics of map(), etc.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 5390a43ce06b27f6d54bc5f237aa305b6948f2af |
|
16-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
translate GL texture targets to PIPE_TEXTURE_x values
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 9cf9aa1ea2c3f40a09316975410a4b0e202e82ba |
|
10-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
use st_mesa_format_to_pipe_format()
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| f8ab24760d0d3f07e9ee81c98207ddf92dfe74da |
|
10-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
rename st_cb_teximage.h st_format.h
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| a25dd4d407a9ed797d4b9841c62f33efdfa07847 |
|
10-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
code movement
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| b245840b86cf877c9b8d666edf229364a84f1dea |
|
08-Aug-2007 |
Brian <brian@i915.localnet.net> |
set mt->format
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 14b98343309fdcff3514f05020303f7b40e83a4a |
|
08-Aug-2007 |
Brian <brian@i915.localnet.net> |
s/intel/st/
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| d78dab126724e6e9d475289a086fb6f85adc3985 |
|
07-Aug-2007 |
Brian <brian@i915.localnet.net> |
plug in texture/sampler state update
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 6da9234fd437f97267e7831f034c78b31156d939 |
|
06-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
New st_init_*_functions() to initialize the driver functions table.
We need to do these initializations before initializing the Mesa context
because context init involves creating texture/program/etc objects.
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|
| 24df8f895fe8807aa2ba058e71bd40adfc01d21e |
|
06-Aug-2007 |
Brian <brian@i915.localnet.net> |
new texture functions
/external/mesa3d/src/mesa/state_tracker/st_cb_texture.c
|