| d32aff91c1c42b3f8bfb6c4109a8ea79c1f46d8d |
|
03-Dec-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: add null pointer check in st_renderbuffer_delete()
In my testing I haven't found any cases where we get a null context
pointer, but it might still be possible. Check for null just to be safe.
Note: This is a candidate for the stable branches.
(cherry picked from commit a4311054c78536acba0c3006c5d2805e182fa483)
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 527b3b8555f695d5b349d00eb1e63208b797bf2c |
|
30-Nov-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix context use-after-free problem in st_renderbuffer_delete()
The use-after-free happened when the renderbuffer was shared by multiple
contexts and we tried to delete the renderbuffer using a context which
was previously deleted.
Note: this is a candidate for the stable branches.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
(cherry picked from commit 4cedb65a43ae81c7ac71e631c854b7404dd2b61b)
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 9d4ab9a663d4088ec553edaae0eeafb746d2490d |
|
11-Feb-2013 |
Brian Paul <brianp@vmware.com> |
mesa: pass context parameter to gl_renderbuffer::Delete()
We sometimes need a rendering context when deleting renderbuffers.
Pass it explicitly instead of trying to grab a current context
(which might be NULL). The next patch will make use of this.
Note: this is a candidate for the stable branches.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
(cherry picked from commit c73245882c7ff1277b190b97f093f7b423a22f10)
Conflicts:
src/mesa/swrast/s_renderbuffer.c
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| dca04373c2efb177dbb7dca3ad2b57cb36b2ebe6 |
|
30-Aug-2012 |
Brian Paul <brianp@vmware.com> |
mesa: fix-up and use _mesa_delete_renderbuffer()
_mesa_delete_renderbuffer() should free the mutex (though that may be a
no-op) and then free the renderbuffer object itself. Subclasses of
gl_renderbuffer can use this function too.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
(cherry picked from commit 8472bb4508515cf0f717344ef5cc863b6e97e56a)
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| cf77c29e6015d177c046adee3c48589cc9fb5015 |
|
10-Aug-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix renderbuffer validation bug
After we attach a new renderbuffer in this function we need to make
sure Mesa's update_framebuffer() gets called.
Fixes crash in WebGL conformance/textures/texture-attachment-formats.html,
but the test still fails for other reasons.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=53316
Note: This is a candidate for the 8.0 branch.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 07b9b3c37b33e4994ff71930aed77821e758f0c9 |
|
22-Jul-2012 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: set the correct window renderbuffer internal format
The multisample-resolve blit relies on this being correct.
Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 9dfe92019a6f76943316d84f437ca323c75234bc |
|
29-Jun-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: use DEBUG_INCOMPLETE_FBO debug flag
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 2a4af651e6997f2fb88efd07aad14542a1b08579 |
|
25-Jun-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: added some simple fbo debugging/helper code
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 7c3786d780e1c475b219c3f2ddbe33554177be02 |
|
15-Jun-2012 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: properly allocate MSAA renderbuffers
Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| c760283159dbf3607b0f072b0d1ff50859feb3f4 |
|
15-Jun-2012 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: make unsupported renderbuffer formats always fail as FBO incomplete
instead of failing to allocate a renderbuffer.
This also fixes piglit/get-renderbuffer-internalformat with non-renderable
formats.
Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| e4b2e6b5270644c267892fae07d919b494cc4397 |
|
15-Jun-2012 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: separate sw renderbuffer allocation from hw one
Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| c68334ffc0a97406eedf11a6b8f4d846b236fb45 |
|
03-Feb-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: add floating point formats in st_new_renderbuffer_fb()
To allow creating floating point buffers / pbuffers.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| dba7ad0ca92f1ff4012db4ffdf102d7bb8ee3c10 |
|
13-Feb-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: assorted clean-ups in st_cb_fbo.c
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 418306397fa7f71e070b285919460e9914af8739 |
|
13-Feb-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove st_framebuffer_renderbuffer()
Just use _mesa_framebuffer_renderbuffer().
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 5a70e12fc0897a3178c73b20d99fc0f11b180374 |
|
11-Feb-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: don't set PIPE_BIND_DISPLAY_TARGET for user-created renderbuffers
The st_renderbuffer_alloc_storage() function is used to allocate both
window-system buffers and user-created renderbuffers. The later kind
are never directly displayed so don't set PIPE_BIND_DISPLAY_TARGET for
those surfaces.
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_fbo.c
|
| d9ae5db6e3aed724b81324c67074c2d792a2f2a5 |
|
11-Feb-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove redundant memset(surface_template,0)
The subsequent u_surface_default_template() call does that for us.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 2e12b4cfef79b81a68597ec1320754989b1c1fa4 |
|
11-Feb-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove st_renderbuffer::stride
It was only used for software buffers and easily computed.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| d765c8ee8c761bb73d634bb274cfc5061892c9a8 |
|
11-Feb-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove st_renderbuffer::format
We only used it in a few places that can implemented differently.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 69c8f468ba93dc2999d4fde8909f8051e910929a |
|
24-Jan-2012 |
Marek Olšák <maraeo@gmail.com> |
mesa: remove ctx->Const.sRGBCapable
It always had the same value as ctx->Extensions.EXT_framebuffer_sRGB.
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| a4a566a610778e6ab93424a38e372c3dcb7d92d3 |
|
16-Jan-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove gl_renderbuffer::GetPointer stuff
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| ca6d86d26b1726b13baa21b73fe9d426f28370e2 |
|
16-Jan-2012 |
Brian Paul <brianp@vmware.com> |
st/mesa: remove gl_renderbuffer:DataType assignments
That field is only used by swrast code so there's no reason to mess
with it in the gallium state tracker.
This also lets us remove the unused st_format_data() type function and
related code.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.c
|
| 122c6768e3d4c1d1b57203eca70569f9301baab5 |
|
03-Dec-2011 |
Brian Paul <brianp@vmware.com> |
mesa: rewrite accum buffer support
Implemented in terms of renderbuffer mapping/unmapping and format
packing/unpacking functions.
The swrast and state tracker code for implementing accumulation are
unused and will be removed in the next commit.
v2: don't use memcpy() in _mesa_clear_accum_buffer()
v3: don't allocate MAX_WIDTH arrays, be more careful with mapping flags
Reviewed-by: Eric Anholt <eric@anholt.net>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 68564726898308c9fd7ac63169bfc2e2012d6fe3 |
|
29-Nov-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: don't try to allocate zero-sized renderbuffers
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=43047
and https://bugs.freedesktop.org/show_bug.cgi?id=43048
Note: This is a candidate for the 7.11 branch.
Tested-by: Vinson Lee <vlee@vmware.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| c87d1a3c3d24924f8af082e47c18a6d535419089 |
|
21-Nov-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix accum buffer allocation in st_renderbuffer_alloc_storage()
If the gallium driver doesn't support PIPE_FORMAT_R16G16B16A16_SNORM
the call to st_choose_renderbuffer_format() would fail and we'd generate
an GL_OUT_OF_MEMORY error. We'd never get to the subsequent code that
handles software/malloc-based renderbuffers.
Add a special-case check for PIPE_FORMAT_R16G16B16A16_SNORM which is used
for software-based accum buffers. This could be fixed in other ways but
it would be a much larger patch. st_renderbuffer_alloc_storage() could
be reorganized in the future.
This fixes accum buffer allocation for the svga driver.
Note: This is a candidate for the 7.11 branch.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| e0e454943cf40730b6ba311310d9878f704a4f95 |
|
12-Nov-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: check renderbuffer orientation in st_MapRenderbuffer()
We'll soon be able to use these for a core Mesa implementation of
glReadPixels.
Acked-by: Eric Anholt <eric@anholt.net>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 377eb5c30cfe94723cad214f12ca4ff9e5aee35e |
|
05-Nov-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: first implementation of Map/UnmapRenderbuffer()
Untested, but also unused at this point.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 866f9b18c68ede63c00917ec9c3dae3524ca8826 |
|
11-Sep-2011 |
Dave Airlie <airlied@redhat.com> |
gallium: rename ZS stencil type to UINT (v2)
these are never USCALED, always UINT in reality.
taken from some work by Christoph Bumiller
v2: fixup formatting of table + tabs
Signed-off-by: Dave Airlie <airlied@redhat.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| c6f9d80ad2d11b44c38098cd0ae2eb91d31b86d9 |
|
29-Sep-2011 |
Simon Farnsworth <simon.farnsworth@onelan.co.uk> |
gallium: Set renderbuffer's InternalFormat when rendering to texture
When an FBO is rendering to a texture (rather than a renderbuffer),
Gallium sets up an internal renderbuffer to handle the rendering, and
copies over enough texture state to make this work.
InternalFormat was missed out, causing glTexCopyImage to take a slow
path unnecessarily.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=41263
Signed-off-by: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
Signed-off-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| de414f491526610bb260c73805c81ba413388e20 |
|
22-Sep-2011 |
Michel Dänzer <michel.daenzer@amd.com> |
st/mesa: Finalize texture on render-to-texture.
This makes sure that stObj->pt exists and is up to date.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=39193 and piglit
fbo-incomplete-texture-03.
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
NOTE: This is a candidate for the 7.11 branch.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| c1cac8feecb9f868d7273e8892a6562e533d929a |
|
07-Sep-2011 |
Stéphane Marchesin <marcheu@chromium.org> |
st/mesa: Remove unused renderbuffer fields and functions.
Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| b438005d961bc7fcc8cbedc34b8b15dfd09365b1 |
|
06-Jun-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix renderbuffer internal format for accum buffer
Fixes an accum buffer regression since switching to the table-based
format selection code.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 49d4e803d369e0faedfa44063fb7f6232faa8175 |
|
28-May-2011 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: fix changing internal format via RenderbufferStorage
The problem is: The second time the function is called with a new
internal format, strb->format is usually not PIPE_FORMAT_NONE.
RenderbufferStorage(... GL_RGBA8 ...);
RenderbufferStorage(... GL_RGBA16 ...); // had no effect on the format
Broken with: fd6f2d6e5783d8810d0ab88e1c470958fd5eb2eb
Test: piglit/fbo-storage-completeness
NOTE: This is a candidate for the 7.10 branch.
(if fd6f2d6e5783d8810d0ab88e1c470958fd5eb2eb is cherry-picked as well)
Reviewed-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| fd6f2d6e5783d8810d0ab88e1c470958fd5eb2eb |
|
12-Apr-2011 |
pepp <pelloux@gmail.com> |
st/mesa: assign renderbuffer's format field when allocating storage
See http://bugs.freedesktop.org/show_bug.cgi?id=36173
NOTE: This is a candidate for the 7.10 branch.
Signed-off-by: Brian Paul <brianp@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| db0f9e701d59dcfcd3b50f4d245897692f27fec9 |
|
05-Apr-2011 |
Brian Paul <brianp@vmware.com> |
mesa: added _mesa_get_attachment_teximage() helpers
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 25f26997670302b07d48207b28f385f85f6af9bb |
|
28-Mar-2011 |
Marek Olšák <maraeo@gmail.com> |
gallium: add a CAP for mixed colorbuffer format support
Some GPUs can't do it (I think most of DX9 ones), so they should have
the option not to allow it.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.c
|
| bdf103894026238c7e896eccb995b141161bfb70 |
|
08-Mar-2011 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: remove unnecessary flushes
The framebuffer cache flush should be implicit when calling
set_framebuffer_state.
There is no need to flush the command stream either.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| fb5d9e1199cabe653ae1bb822bb66ce9f0ce7f55 |
|
06-Mar-2011 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: fail to alloc a renderbuffer if st_choose_renderbuffer_format fails
This fixes:
state_tracker/st_format.c:401:st_pipe_format_to_mesa_format:
Assertion `0' failed.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 633c9fcf781d4cc23d69d4d839cf2143ac9df1fd |
|
18-Feb-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: set renderbuffer _BaseFormat in a few places
NOTE: This is a candidate for the 7.9 and 7.10 branches
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| c0beaf6e6d5764531a4cb21d0d0a9a1fd09affee |
|
10-Feb-2011 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: allow rendering to sRGB textures if EXT_fb_srgb is unsupported
In this case, we always use the corresponding linear format in create_surface,
therefore we should check for linear format support as well.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 21b0996dfcbe62c55dd31cc316cd47f2b8531d2e |
|
06-Feb-2011 |
Dave Airlie <airlied@redhat.com> |
mesa/st: enable GL_EXT_framebuffer_sRGB
If the formats don't match we need to update the surface with the new
format.
if we can render to SRGB formats, enable the extension
Signed-off-by: Dave Airlie <airlied@redhat.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.c
|
| edc09358f72cd48cb2315daf23c82e7646aeaea3 |
|
09-Jan-2011 |
Vinson Lee <vlee@vmware.com> |
st/mesa: Include mfeatures.h in files that perform feature tests.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 35266fbe4f2d11093e71ef41083d9d733aac5869 |
|
03-Jan-2011 |
Brian Paul <brianp@vmware.com> |
st/mesa: 80-column wrapping
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.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_fbo.c
|
| 31aca27c08d6a385c595d34fe4ee06390bf5b0e8 |
|
12-Oct-2010 |
Kristian Høgsberg <krh@bitplanet.net> |
Drop GLframebuffer typedef and just use struct gl_framebuffer
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 71a079fb4ecbd17703ac9b5e6d5ef622fd7bc50f |
|
11-Aug-2010 |
Dave Airlie <airlied@redhat.com> |
mesa/st: initial attempt at RG support for gallium drivers
passes all piglit RG tests with softpipe.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 24bd9780bcf400a00f6fc5a89b1648c7e3b7df07 |
|
23-Aug-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: added st_is_depth_stencil_combined() function
This code is part of a patch by Marek Olšák.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 3070e0ea41ab4aa24804e8fd26895924a8583830 |
|
06-Aug-2010 |
Luca Barbieri <luca@luca-barbieri.com> |
mesa/st: support using PIPE_TEXTURE_RECT internally
Currently Gallium internals always use PIPE_TEXTURE_2D and normalized
coordinates to access textures.
However, PIPE_TEXTURE_2D is not always supported for NPOT textures,
and PIPE_TEXTURE_RECT requires unnormalized coordinates.
Hence, this change adds support for both kinds of normalization.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 9d4a0d7d4df3934cdefe4fe1118603e618d59831 |
|
13-Aug-2010 |
nobled <nobled@dreamwidth.org> |
st/mesa: test for FEATURE defines
'struct dd_function_table' only conditionally contains
the function pointer NewFramebuffer and friends based on
FEATURE_EXT_framebuffer_* defines. (See src/mesa/main/dd.h)
Fixes the build when the features are disabled and the vfuncs
don't exist.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 4fd39a8d69cade6db5c4a0295a5f5f3014110b1c |
|
17-Jul-2010 |
Marek Olšák <maraeo@gmail.com> |
st/mesa: fix FRAMEBUFFER_UNSUPPORTED with the D24S8 format
Fixes FDO bug #29116.
NOTE: this is a candidate for the 7.8 branch
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 6f3721a8ecb3695344e9a878bb452342ee502764 |
|
18-May-2010 |
Roland Scheidegger <sroland@vmware.com> |
st/mesa: fix wrong argument order
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.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_fbo.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_fbo.c
|
| eb2bd2158ed8c1983ef427ea792dc159a2144c08 |
|
23-Apr-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: replace 'usage' with 'bindings' to be consistent
Plus, update comments and formatting.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 86d2383e771a4e53bbee2ce0b6f924f0438249b5 |
|
21-Apr-2010 |
José Fonseca <jfonseca@vmware.com> |
mesa/st: Translate a few more mesa/gallium formats.
These endup used by Xvnc.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| c3016dcee562953dc187b484a27203c735f9662b |
|
19-Apr-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: s/st_get_texobj_texture/st_get_texobj_resource/
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.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_fbo.c
|
| ef9a619ba9c49e27ac3fd1c2925ae6b288cd4a09 |
|
19-Apr-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: s/st_sampler_view_from_texture/st_create_texture_sampler_view/
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.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_fbo.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_fbo.c
|
| 6fb364a1717858d8201b2caf234076ce5d4832ac |
|
30-Mar-2010 |
Roland Scheidegger <sroland@vmware.com> |
gallium: adapt all code to the renamed depth/stencil formats
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.c
|
| 8cdfd1219a2d13d252a8691ee6dddb0d773bdc77 |
|
16-Mar-2010 |
Keith Whitwell <keithw@vmware.com> |
Merge commit 'origin/master' into gallium-sampler-view
This branch already seems to have the nv50_tex.c fix.
Conflicts:
src/gallium/drivers/nv50/nv50_tex.c
|
| dbf20a1f0fa7965254aa8a0e2ea35a6b8576fd7d |
|
15-Mar-2010 |
Michal Krol <michal@vmware.com> |
st/mesa: Cache FBO texture's sampler view object.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| de8a879f5c77dbf5c31251e07b2f1b8d2635716c |
|
07-Feb-2010 |
Chia-I Wu <olv@lunarg.com> |
st/mesa: Implement st_api.h.
There is currently no user of this new interface. As the inteface can
coexist with st_public.h, everthing should work as before.
ST_TEXTURE_2D is both defined by st_public.h and st_api.h. Reorder the
headers in st/dri to avoid conflicts.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 06c44e852f4b38db03772adec769854b2f3096f6 |
|
10-Mar-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: set strb->format field in st_render_texture()
This fixes a problem in glReadPixels when reading from an FBO's texture
attachment. We have a better chance at hitting a fast path for
glReadPixels now.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 80dc54e308dfb1fad344272978ff14646995e00a |
|
08-Mar-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: don't detach renderbuffer, surface in st_finish_render_texture()
There's no reason to release the renderbuffer from the framebuffer object
or release the gallium surface in this function (they're reference counted).
In fact, we don't want to do this because we may later use the texture as a
pixel source (ex: glBlitFramebuffer) and need the surface.
Fixes fd.o bug 26923 and is part of the fix for bug 26932.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 7d1a79a04eb1266649956f6924f25071d85e20fe |
|
01-Mar-2010 |
José Fonseca <jfonseca@vmware.com> |
mesa: Rename pipe formats.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| d7de632de39888dbc955055ba0eb3623e5335992 |
|
24-Feb-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: clean-ups in FBO code
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 87c85347ed8f74a855532fe6862d3ef62937ccbb |
|
24-Feb-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: clean-up of format-related code
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 5bc62895e294ea461e8487bac1aa84c6cc4f6809 |
|
24-Feb-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: code clean-ups in st_renderbuffer_alloc_storage()
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.c
|
| 6352f4c854e9ec39c440054109ccb92caa5ff0bb |
|
11-Feb-2010 |
Brian Paul <brianp@vmware.com> |
st/mesa: fix gallium texture level selection for RTT
Fixes invalid texture level when rendering to a texture where
GL_BASE_LEVEL > 0.
This will be cherry-picked to the 7.7 branch after additional
testing.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 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_fbo.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
|
| 56cd5806e89fea9598e296ce656dfe550bf2b96e |
|
16-Jan-2010 |
Vinson Lee <vlee@vmware.com> |
st/mesa: Remove unnecessary header from st_cb_fbo.c.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.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
|
| 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_fbo.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_fbo.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_fbo.c
|
| d509f84543d0979e9bb53c20c195f378dd61e728 |
|
26-Nov-2009 |
Roland Scheidegger <sroland@vmware.com> |
gallium: fix more statetrackers/drivers for not using texture width/height/depth arrays
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.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
|
| 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_fbo.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_fbo.c
|
| 2ef1aae1633db98fc52f440ca33b8f2a6f153d45 |
|
07-Oct-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: pass pipe_screen, not pipe_context to st_choose_format() functions
These don't depend on context state, but use a screen pointer.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 55770d09c18c4d33403abb97dfef4f897efbbe2a |
|
05-Oct-2009 |
Brian Paul <brianp@vmware.com> |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/gallium/auxiliary/util/u_cpu_detect.c
|
| 75e0a376cd32b127f3168c0af12992b5c8576e92 |
|
05-Oct-2009 |
José Fonseca <jfonseca@vmware.com> |
mesa: Copy textures' base format into wrapper renderbuffer.
Otherwise st_copy_texsubimage will fallback to software blit due to
inconsistent base formats.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| b3e41e0d5e03b040768547293e05e6540d3c8e4d |
|
01-Oct-2009 |
Brian Paul <brianp@vmware.com> |
st/mesa: check for null before asserts, fix possible mem leak
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 82c2f7756af19f0a19aeda7ea1f627262e4561c0 |
|
20-Sep-2009 |
Nicolai Hähnle <nhaehnle@gmail.com> |
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
|
| c4ce6f6a7c124c62a8ee9bd9fba28fc69a38e18c |
|
12-Sep-2009 |
Nicolai Hähnle <nhaehnle@gmail.com> |
mesa/st: Initialize format bits of framebuffer renderbuffers
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| f583745519b2b99ca637cdfa6201fd653c848fd6 |
|
30-Jul-2009 |
Thomas Hellstrom <thellstrom@vmware.com> |
mesa st: Report unsupported render-to-texture formats.
If a texture image is bound to a framebuffer for render-to-texture, but
the hardware doesn't support rendering to its internal format,
report the framebuffer as incomplete with FRAMEBUFFER_UNSUPPORTED.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| bf89ecb6c92aaaeccd7b6f093cb8bae9fd56aaf6 |
|
11-Jun-2009 |
José Fonseca <jfonseca@vmware.com> |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/state_tracker/st_framebuffer.c
|
| 52411a1951da10bebc439a30c02c7ca99bc27c9c |
|
10-Jun-2009 |
José Fonseca <jfonseca@vmware.com> |
mesa: Pure software accum buffer.
The existing implementation was already implemented on software, but relied
on the pipe driver to always support the R16G16B16A16_SNORM format. This
patch eliminates that, without prejudice against a future hardware-only
implementation.
It also avoids some of the short <-> float conversions, and only does a read
transfer of the color buffer on GL_RETURN if absolutely necessary.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| a7ef5b76d6889c4a6614eddea0c021c83f6a8703 |
|
02-May-2009 |
Brian Paul <brianp@vmware.com> |
Merge branch 'mesa_7_5_branch'
|
| 0a56a4968786bd93d9117af2a0a3bda13ea71c4d |
|
02-May-2009 |
Brian Paul <brianp@vmware.com> |
st: create renderbuffer's pipe_surface in st_render_texture()
Previously we created the pipe_surface during framebuffer validation.
But if we did a glCopyTex[Sub]Image() before anything else we wouldn't yet
have the surface. This fixes that.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 3f52a853f795d7432b181de81da6f0c4cf1cc202 |
|
01-May-2009 |
Brian Paul <brianp@vmware.com> |
st: when creating an on-demand front color buffer, init to back buffer image
When we create a new front color buffer (user called glDrawBuffer(GL_FRONT))
initialize it to the contents of the back buffer. Any previous call to
SwapBuffers() would have done that in effect, so make it reality.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| b85b315ebbe25efbd118887bdc87a562d4334fcc |
|
01-May-2009 |
Brian Paul <brianp@vmware.com> |
st: added st_renderbuffer::defined flag
Indicates whether there's defined image contents, or garbage/don't care.
This is set when we draw into a renderbuffer and cleared when we resize/
reallocate a renderbuffer or do a buffer swap (back buffer becomes undefined).
We use this to determine whether the front color buffer has been drawn to,
and whether to display its contents upon glFlush/Finish(), when the new
st_swapbuffers() function is used.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| cd6734288ddc15a778def9578e128184b3f6bdea |
|
01-May-2009 |
Brian Paul <brianp@vmware.com> |
st: when double buffered, only create front color buffer on demand
Before we always created the front color buffer, even if was never used.
This can save some memory.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| e53d6ab39bf04b2bb39ad23d5990494321ee77ce |
|
09-Apr-2009 |
Brian Paul <brianp@vmware.com> |
st: rearrange some code to be a little more clear
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 227aa0070d3b13baaa87270fd1a45fa5904ae3dc |
|
09-Apr-2009 |
Brian Paul <brianp@vmware.com> |
gallium: remove unneeded compressed=0 assignment
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 45bde75bd67e7e920f0113842d1fa58613ccc3ec |
|
04-Mar-2009 |
Michel Dänzer <daenzer@vmware.com> |
gallium: Remove some superfluous instances of #include "p_inlines.h".
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.c
|
| 3873ffe27d00f4890290441a6a6923e09ff9434c |
|
03-Mar-2009 |
Brian Paul <brianp@vmware.com> |
gallium: remove old state tracker renderbuffer attachment assertion
Not needed since renderbuffers are ref-counted.
Fixes progs/demos/shadowtex.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 5fc74734d92f7e7ff3df693254986ba5d2b5e653 |
|
27-Feb-2009 |
Brian Paul <brianp@vmware.com> |
gallium: add st_validate_framebuffer() driver function
Gallium only supports combined depth/stencil buffers, not separate ones.
If the user tries to create create a FBO with separate depth/stencil
renderbuffers mark the FBO as unsupported.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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
|
| 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_fbo.c
|
| 1a2f4dd8768703fbc1b2a0d5be342345644805b4 |
|
12-Feb-2009 |
Brian Paul <brianp@vmware.com> |
mesa: consistantly use mesa memory-functions in gallium state tracker
Use _mesa_malloc(), _mesa_free(), etc everywhere, not malloc(), free(), etc.
Still using CALLOC_STRUCT() at this point.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| e97681c7f551a2a2a6bd5eff0f4192a870c816c0 |
|
09-Feb-2009 |
Brian Paul <brianp@vmware.com> |
mesa: merge gallium-0.2 into gallium-master-merge
Merge commit 'origin/gallium-0.2' into gallium-master-merge
Conflicts:
Makefile
docs/relnotes-7.4.html
docs/relnotes.html
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/main/imports.c
src/mesa/main/mtypes.h
src/mesa/main/texcompress.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_save_draw.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_fbo.c
|
| 5069bfed29bcee2c89c36c74c6d65d388eb7792e |
|
03-Feb-2009 |
Zack Rusin <zackr@vmware.com> |
gallium: remove pipe_buffer from surfaces
this change disassociates, at least from the driver perspective,
the surface from buffer. surfaces are technically now views on the
textures so make it so by hiding the buffer in the internals of
textures.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| adfbba476db1fc55006efb748656ebb1a481d143 |
|
30-Jan-2009 |
Zack Rusin <zackr@vmware.com> |
gallium: make p_winsys internal
move it to pipe/internal/p_winsys_screen.h and start converting
the state trackers to the screen usage
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| abd280ab0b72979bf709b2d029e11c8f4bc4d5f8 |
|
15-Jan-2009 |
Alan Hourihane <alanh@vmware.com> |
mesa: tweak to formatting
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| bfbb57790a06bb03e9bf3237b7f8756a67702192 |
|
15-Jan-2009 |
Alan Hourihane <alanh@vmware.com> |
mesa: small cleanup
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 85dfed93fe2a6aace7dd2e08f97760e7062e6eb3 |
|
14-Jan-2009 |
Alan Hourihane <alanh@vmware.com> |
mesa: handle some cases of 0x0 render targets
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| d2c2e9316d043ab584794a3524f22776deb4c777 |
|
12-Dec-2008 |
Keith Whitwell <keith@tungstengraphics.com> |
gallium: avoid mapping same vertex buffer in subsequent frames
Quite a few util modules were maintaining a single vertex buffer over multiple
frames, and potentially reusing it in subsequent frames. Unfortunately that
would force us into syncrhonous rendering as the buffer manager would be
forced to wait for the previous rendering to complete prior to allowing the
map.
This resolves that issue, but requires the state tracker to issue a few new
flush() calls at the end of each frame.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 63b915d743e1807696a55f5e52a1fe9df799aeb3 |
|
17-Sep-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: new assertion on surface->texture
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 9ca1c62a963ca7024c4bccf83af3f90955cd5068 |
|
04-Jul-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: replace assertion with conditional
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 429a08384c2ea66d446e46beb28e33ee3b764d52 |
|
27-Jun-2008 |
Roland Scheidegger <sroland@tungstengraphics.com> |
gallium: handle msaa
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.c
|
| 158298eea075e87e4e3b4da9f6a606550f975b5d |
|
20-Jun-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: remove unused vars
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 635abed109b26ded34954c379b80e306c602384b |
|
26-May-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: free renderbuffer's old texture in st_renderbuffer_alloc_storage()
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.c
|
| f9e2f26df3c16eaa0c56db11cd94b5af7a361ee8 |
|
09-May-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: re-enable call to init_renderbuffer_bits(), remove dead code
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.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_fbo.c
|
| 973d0c014dba87308e358291de0730d38d50a733 |
|
06-May-2008 |
Michal Danzer <michel@tungstengraphics.com> |
gallium: create renderbuffer surface w/out CPU_READ/WRITE flags
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 99df379b2c5b8e4e2ee7e5f2af864daf0a9eb1f7 |
|
02-May-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: set template.target = PIPE_TEXTURE_2D
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| b2021e7c06a9ec13b82eeeb352ad2408fe060518 |
|
02-May-2008 |
Keith Whitwell <keith@tungstengraphics.com> |
gallium: identify depth-stencil textures
And don't use the display-target path to allocate them.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.c
|
| 4a159132082429d5492f5298c2ccb0df551c9f65 |
|
02-May-2008 |
Keith Whitwell <keith@tungstengraphics.com> |
gallium: remove usage of winsys->surface_alloc_storage from state tracker
Allocate a texture containing storage instead.
Also clean up ACCUM buffer allocation slightly -- drivers will need
some changes to texture allocation logic to accomodate the concept of
a texture that will only as image storage by the CPU, but it's cleaner
than it was.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| c9ed86a96483063f3d6789ed16645a3dca77d726 |
|
01-May-2008 |
Keith Whitwell <keith@tungstengraphics.com> |
gallium: tex surface checkpoint
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 99fba5466bfd14c4e052041c0571821be529e762 |
|
30-Apr-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: use new buffer wrapper functions in p_inlines.h
This allows us to remove most of the direct references to winsys in the state tracker.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| dd9dc7df80d208b884b4c090e4408c9a12aa6095 |
|
29-Apr-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: added some assertions to st_render_texture() to check surface format
Make sure we can really render to the texture surface given its format.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| d7b523b46b833fd08c70850d7a6cc7b6fd714a8e |
|
25-Apr-2008 |
Michel Dänzer <michel@tungstengraphics.com> |
gallium: Tell the driver the texture is updated when we finish rendering to it.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 7333578d2a5fa18f7f0101fc3fd3b03cf2f356bc |
|
24-Apr-2008 |
Michel Dänzer <michel@tungstengraphics.com> |
gallium: Initial support for pixel formats with unused storage components.
Also clarify that RGB formats with no (used) alpha component are treated as
having alpha = 1.0.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 0dd596fbc7f88b88467529a7f176aca70d70f731 |
|
07-Apr-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: accum buffer fixes
If the driver can't create a PIPE_FORMAT_R16G16B16A16_SNORM surface, create
an accum surface using a shallower format and taller height. Since only the
accum buffer code accesses the surface the actual format doesn't really
matter, just that there's enough memory.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 2b2d0e05842691e715782a64845aeca12a428427 |
|
07-Apr-2008 |
Brian Paul <brian.paul@tungstengraphics.com> |
gallium: clean-up in st_renderbuffer_alloc_storage()
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 4abe1eb980ed76d2b2d3383eaab520d0aa2ae6f4 |
|
26-Mar-2008 |
Michel Dänzer <michel@tungstengraphics.com> |
gallium: Change pipe->flush() interface to optionally return a fence.
The cell driver still uses an internal CELL_FLUSH_WAIT flag, in the long run
proper fencing should be implemented for it.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.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_fbo.c
|
| 1e0d30a515e4cac891b6c590f12a33e0e8a8e295 |
|
25-Jan-2008 |
Keith Whitwell <keith@tungstengraphics.com> |
gallium: rename pipe_buffer_handle to pipe_buffer, rework pipebuffer/ code
Provide an actual definition of the pipe_buffer struct, containing
the parameters used to create the buffer, and its refcount.
Shift refcounting buffers out of the winsys interface, similar to
surfaces & textures.
Rework pipebuffer/ to reflect the fact these changes, and also Michel's
reworking of the buffer interface.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 271f9dac79a9247de9a57f4d248e404bf1652a13 |
|
17-Jan-2008 |
José Fonseca <jrfonseca@tungstengraphics.com> |
Back-port miscellaneous fixes from internal branch (mostly portability fixes).
These are changes that are in our internal branch, but somehow were skipped
so far. It was done using visual comparison of the branches --
it is likely that changes are being carried on the wrong way
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.c
|
| a85535b7cb0886f23e5686e37d1fa54394cdece4 |
|
20-Dec-2007 |
Keith Whitwell <keith@tungstengraphics.com> |
gallium: make state tracker explictly ask for rendercache flushes
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| a2b4d4a8db77443b834daf811802a909768fa926 |
|
14-Dec-2007 |
Brian <brian.paul@tungstengraphics.com> |
add missing code for PIPE_FORMAT_S8_UNORM renderbuffer
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 20eae595faa20dba8a59d8a4bfd01aa6b458cecd |
|
12-Dec-2007 |
Brian <brian.paul@tungstengraphics.com> |
Re-org of st_create_framebuffer() and renderbuffer format selection.
st_create_framebuffer() now takes pipe_formats for the color, depth, stencil
buffers.
This avoids a round-about chain of calls to pipe->is_format_supported() for
window renderbuffers (their format never changes).
Renderbuffer format selection code in st_format.c is simpler now too.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 12363674e5aa39b780020339038186b7715bd4b2 |
|
11-Dec-2007 |
José Fonseca <jrfonseca@tungstengraphics.com> |
Add surface storage allocation function to winsys interface.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| c9f9c5098042e4f200efc3d25447a5a8b7e69b36 |
|
11-Dec-2007 |
Brian <brian.paul@tungstengraphics.com> |
XXX comments about some hard-coded values that need to be fixed
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 4f58d9af9addb1506a1b2abc7dd8012147772b78 |
|
10-Dec-2007 |
Brian <brian.paul@tungstengraphics.com> |
Add 'type' parameter to is_format_supported() to specify texture vs. drawing surface, etc.
Additional types may be added in the future.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 37484a387495f1241e5e1220243d6355f5333aca |
|
10-Dec-2007 |
Michel Dänzer <michel@tungstengraphics.com> |
Fix up some confusion wrt winsys->buffer_create alignment / flags parameters.
intel_winsys works again.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| f8f9580a2a1c89af1dc0e169b62440053d9d7e81 |
|
09-Dec-2007 |
José Fonseca <jrfonseca@tungstengraphics.com> |
Adapt for winsys interface changes.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 54fc80ab31f89520d3119196bfa9c6332b35fe2f |
|
08-Dec-2007 |
Brian <brian.paul@tungstengraphics.com> |
Define PIPE_FORMAT_ tokens as an enum set, rather than #defines.
This makes debugging a _lot_ easier.
In gdb, "print format" used to display 613570600, now you see PIPE_FORMAT_A8R8G8B8_UNORM.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| ee6b39cfe602bd88a88bedc5af672832d9157105 |
|
07-Dec-2007 |
Brian <brian.paul@tungstengraphics.com> |
move surface pitch calculation so it always gets updated
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.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_fbo.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_fbo.c
|
| 02f7f46fa15c7d31d774c638684d4f5b81e360ec |
|
08-Nov-2007 |
Brian <brian.paul@tungstengraphics.com> |
new init_renderbuffer_bits() helper
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 7d1a04e499564212a2a9aace12b05f424a357d3f |
|
07-Nov-2007 |
Brian <brian.paul@tungstengraphics.com> |
Add winsys->surface_release() to complement winsys->surface_alloc().
pipe_surface now has a pointer to the winsys which create/owns the surface.
This allows clean surface deallocation w/out a rendering context.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 3470d819fd7e3d3dd259d6fb2d4b963a514f0520 |
|
06-Nov-2007 |
Brian <brian.paul@tungstengraphics.com> |
realloc surface if format changes, remove dead code
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 7de874ec2c7b9e3aff7f81b7e30045b45381fbad |
|
29-Oct-2007 |
Michal Krol <michal@tungstengraphics.com> |
Make it compile under linux.
Move pipe_region/surface_reference functions to pipe/p_inlines.h.
Remove #include "p_util.h" from pipe/p_context.h.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| f16f23b3ab4caf6588ce713fc682aac6e9f808fb |
|
27-Oct-2007 |
michal <michal@michal-laptop.(none)> |
Use PIPE_FORMAT in state tracker.
Fix PIPE_FORMAT field encoding.
Re-implement st_get_format_info.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| e4f6f0ec02133e9297c3f2db787dee14bf0ae6e1 |
|
26-Oct-2007 |
Brian <brian.paul@tungstengraphics.com> |
surface_alloc() is now a winsys function.
This allows surfaces to be allocated without a rendering context.
A few loose ends to resolve, but in working condition.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| f684120417c6b3ca9e7486ffeb24fe88e428834d |
|
26-Oct-2007 |
Brian <brian.paul@tungstengraphics.com> |
Move region_alloc() and region_release() to pipe_winsys.
This allows regions to be allocated w/out a rendering context.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 5c79c088cd0a2c512891b87b67a3c4f810595658 |
|
23-Oct-2007 |
Brian <brian.paul@tungstengraphics.com> |
Don't pad renderbuffers to multiple of two pixels anymore.
This was only needed to avoid out-of-bounds memory accesses with the
2x2 quad_read/write() functions which no longer exist.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| a1633c07164e8bc9630f1fa77769e7ceee585a59 |
|
20-Oct-2007 |
Brian <brian.paul@tungstengraphics.com> |
unmap regions when reallocating renderbuffer storage
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 7b0b694406e4043cb163f9832c9c02934fa54568 |
|
14-Oct-2007 |
Brian <brian.paul@tungstengraphics.com> |
16-bit rgba surface/format for accum
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 2b31b413f97c73816a2845782aee9a49e22d2e0b |
|
10-Oct-2007 |
Brian <brian.paul@tungstengraphics.com> |
use correct mipmap level in st_render_texture()
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 500e3af175cf8ef66bad23ae3b9e440670421ecd |
|
10-Oct-2007 |
Brian <brian.paul@tungstengraphics.com> |
fix width/height padding that caused failed assertion upon window resize
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 617b39ce9811b0998ceb746c935cc50cacf8a9bc |
|
19-Sep-2007 |
Michel Dänzer <michel@tungstengraphics.com> |
Pad surface dimensions to multiples of 2.
Avoids an assertion failure with softpipe if requested width or height is odd.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 7fe09341489ff61dc1a3a771fd3e75b3f866d6a9 |
|
23-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
added GL_STENCIL_INDEX8_EXT
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 8a868919b50bdca4dc697d61e220a8fb50764f8e |
|
22-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
Improved pipe_region/surface_reference() functions
Now dereferences the old object first.
Target object may be NULL to clear the pointer.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 04f2078860d0649b016e9281f86725cb42e15b42 |
|
17-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
added assertions, disable debug output
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 2f605fd457ccd8763ce5b0acc8d2906a59ea22bc |
|
14-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
set renderbuffer Width/Height = texture size
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 5e1bfe426f3e2bc7a13b3814f1fa732141f15a9a |
|
14-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
fix up some render-to-texture code ... almost there
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| faa14a9ded2ddb784302b4634f0ca40c51ec1c4b |
|
13-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
check for ctx==NULL in st_renderbuffer_delete()
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 9ac1a8d416c2bd50ca10186ca09f5e86f6fa4ce6 |
|
10-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
pipe->region_alloc() now takes width instead of pitch, plus a flags param
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 3738606a52b585108d709ce6be8565fc6144cbc7 |
|
10-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
more render to texture work
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 137ec509946bba39940d3a7932bf196450cb951e |
|
10-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
sketch out some render-to-texture code
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.c
|
| a25dd4d407a9ed797d4b9841c62f33efdfa07847 |
|
10-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
code movement
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 6883930f61c67924789f2c7cbc274627407cc784 |
|
09-Aug-2007 |
Brian <brian.paul@tungstengraphics.com> |
init strb->Base.DataType appropriately, clean-ups
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 3c07bbb1982da5629685f569285529f02b35e48c |
|
09-Aug-2007 |
Brian <brian@i915.localnet.net> |
assertions
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| f5713c7d2e7ba8e1170fd9b1dd95379662ab6117 |
|
09-Aug-2007 |
Brian <brian@i915.localnet.net> |
Checkpoint intel_renderbuffer removal.
Remove surface ptr from gl_renderbuffer.
Use st_renderbuffer in most places.
More clean-up.
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|
| 64da7515009f3551796c90acc74eb0a2ffdb68a0 |
|
09-Aug-2007 |
Brian <brian@i915.localnet.net> |
checkpoint: no longer using intel_fbo.c
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.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_fbo.c
|
| 4b87d37e90b6d2d9562a192540833b599bda5a35 |
|
03-Aug-2007 |
Brian <brian@i915.localnet.net> |
framebuffer object functions
/external/mesa3d/src/mesa/state_tracker/st_cb_fbo.c
|