Mesa (master): 30 new commits
Chris Forbes
chrisf at kemper.freedesktop.org
Thu Apr 10 06:50:27 UTC 2014
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d653b948f56815eea6ee2b29bda71546aee0843
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Sat Feb 15 16:27:58 2014 +1300
docs: Mark off ARB_texture_view and add to release notes for 10.2.
V4: Don't claim Gen8 yet.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a2f8cd9d2174eba98943ca6014bab126eb979e8
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Sat Feb 15 16:26:20 2014 +1300
i965: Enable ARB_texture_view on Gen7
V4: Don't enable this for Gen8 yet -- that still needs wired up.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea477817d773b24dbb29b392e3d4bc53f9dd3e90
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Sat Mar 15 08:49:35 2014 +1300
i965: Account for view parameters in blit CTSI path
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=01d6a2ad1635c7db1633fdf695950818731a7648
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Sat Mar 15 08:16:42 2014 +1300
i965: Account for MinLayer/MinLevel in blorp CTSI path
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=058f353a159a6e34adb6d45462a18de86685a046
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Sat Feb 15 16:25:12 2014 +1300
i965: Account for view parameters in fast depth clears
V2: - No need for layer_multiplier; multisampled depth surfaces are IMS.
- Remove unused num_layers.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=540d53d9b0cd357f70cb0f1aeaec82a604c43547
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Tue Jan 21 21:59:02 2014 +1300
i965/blorp: Account for nonzero MinLayer in layered clears.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d581247569fd7995dac1f29e387f2204c1396753
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Tue Jan 21 21:55:38 2014 +1300
i965/blorp: Use irb->layer_count in clear
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=98328e4c193c90bc9945531f82595f09410b1a3b
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Tue Jan 21 21:45:28 2014 +1300
i965: Add layer_count to intel_renderbuffer
This is the effective layer count, for clears etc. This differs from the
depth of the miptree level when views are involved.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0a08147fcbd34c2ff810d10b596e801b92730ef4
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Tue Jan 21 21:53:21 2014 +1300
i965: Pull out layer_multiplier in intel_update_renderbuffer_wrapper
We're about to need this in another place.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a76cde35d8e9a6e2ac2581e9c314f84b2cc92869
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Tue Jan 21 21:44:05 2014 +1300
i965: Add `layered` parameter to intel_update_renderbuffer_wrapper
We're about to need this so we can determine the layer count of the
wrapper.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=85dda825fe73693f926b7fd974a1f9ad1fb7bea4
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Tue Jan 21 23:20:11 2014 +1300
i965: Adjust renderbuffer wrapper to account for MinLevel/MinLayer
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=24f490fb37f5a5b3ab0098aac6e4f6144f4f7029
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Mon Jan 20 20:18:19 2014 +1300
i965: Enable texture upload fast path with MinLevel
We'll still avoid MinLayer here since the fast path doesn't understand
arrays at all, but it's straightforward to do levels.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5de52541e52d0a14d70ef7472d08cdc650d4a222
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Mon Jan 20 20:19:35 2014 +1300
i965: Account for MinLevel in texture upload fast path
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba3499ba01135c54d9b28a4bae916845cdbb64b7
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Mon Jan 20 21:30:35 2014 +1300
i965: Adjust map/unmap code for MinLevel/MinLayer
This allows core mesa's TexSubImage paths etc to work correctly
with views which have nonzero MinLevel or MinLayer.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca1d1b2fc1d1f7fb5dbbc0719c6c899b97bc9e6b
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Mon Jan 20 20:01:35 2014 +1300
i965: Don't try to use fast upload path for nontrivial views
This will eventually be relaxed, but we'll get the fallback path
working first.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9c08867ed07ceb10b67ffac5f0a33812710a5e8
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Tue Jan 21 22:52:32 2014 +1300
i965: Adjust surface_state emission to account for view parameters
V4: Comment style, remove magic shift.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=771c2ae0afc485a63e4668f0eb7713ea161f1b97
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Sat Feb 22 07:15:59 2014 +1300
i965: Add _Format to intel_texobj.
This is the actual mesa_format to use. In non-view cases this is always
the same as the mt's format.
V4: Comment style
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b7f011fdc9007c35921f6271b983ef4ccc6799e4
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Tue Jan 21 22:54:10 2014 +1300
i965: Add driver hook for TextureView
We need to wire the original texture's mt into the view. All the hard
work of setting up an appropriate tree of gl_texture_image structures
has already been done by core mesa.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=93fa16bdd13e67bc3a824bf3408f207c4ff0e894
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Tue Jan 21 22:48:30 2014 +1300
i965: Ensure that texture validation is skipped for immutable textures.
If we were to relayout the miptree, we'd break any views that are
sharing it.
(Simplified based on suggestions from Eric)
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a98b675945bc7920ab7d2bbbf0b9641693a8de5d
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Sat Feb 22 09:06:57 2014 +1300
i965: refactor format selection for unsupported ETC* formats
We will need to call this to munge view formats.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=14c116433dd7e5a474c394283be682684bc8d3af
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Sat Feb 22 08:51:41 2014 +1300
i965: refactor format munging for separate stencil
We will need this for munging the view's format.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=215c9432b91a8f7e3664acab835d8d191375e442
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Tue Jan 21 22:47:26 2014 +1300
i965: Include #slices in miptree debug
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c1b017472bbee23d8cc6595707055561239a62a7
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Sat Jan 25 10:36:04 2014 +1300
mesa: Adjust _MaxLevel computation to account for views
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=61e264f4fcdba3623781a0a339426672f0d431e4
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Mon Mar 10 21:36:22 2014 +1300
mesa: Prefer non-swizzled formats for most sized internalformats
These formats can be cast to others (with different component types or
sizes) via ARB_texture_view or ARB_shader_image_load_store. We want
them to be laid out consistently so that we can just reinterpret the
memory with a different format.
In V1, this was done conditionally on a 'prefer_no_swizzle' flag which
was set in TexStorage/TextureView paths, but we need the same behavior
for ARB_shader_image_load_store (which also works with images created
via TexImage, so we don't want it to be conditional.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=58790043bb9e222f54994eba6ec78429d0d23625
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Sat Mar 29 18:27:42 2014 +1300
i965: Render R8G8B8X8 as R8G8B8A8
The sampler can handle R8G8B8X8 (and substitute 1.0 for the fourth
component) but we can't use it as a render target.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=50eed4eed5d81cdf190d257506d36c5c23d4ce3b
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Sat Dec 14 17:40:03 2013 +1300
i965: Pretend we don't support BRW_SURFACEFORMAT_R16G16B16_FLOAT for textures.
None of the other 3-component 16bpc formats are directly supported, so
they get promoted to XRGB equivalents. *Not* promoting RGB16F the same
way makes texture views much more fiddly -- we don't want to have to do
crazy copying behind the scenes.
(with my other master + my experimental ARB_texture_view support) fixes
the piglit test: `spec/ARB_texture_view/view compare 48bit formats`
No regressions in gpu.tests on Haswell.
V4: Don't alter the formats table -- just don't match it to a mesa_format. [Kenneth]
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=66b0554fa63cf1a9de0637c71e8e769763c267b0
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Sat Mar 15 21:50:28 2014 +1300
i965: Enable R10G10B10A2_UNORM format
This is supported by all generations, and is required for memory layout
consistency for texture_view.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=932a1eeac83eb4191af0809036d9de3797205c1b
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Mon Mar 10 22:00:44 2014 +1300
i965: Enable R8G8B8A8_UNORM_SRGB format
Now this is the preferred format for GL_SRGB8_ALPHA8.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ef720561326b3ef9a2eb9e20f1a4ef0395d111b
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Sat Mar 29 17:29:37 2014 +1300
swrast: Add support for fetching from MESA_FORMAT_R10G10B10A2_UNORM
V4: Fix rebase conflicts with Brian's renaming of the texfetch
functions.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Brian Paul <brianp at vmware.com>
Acked-by: Eric Anholt <eric at anholt.net>
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a421be1dcbf0c8aca4ec0a1862299c27c04d7e6c
Author: Chris Forbes <chrisf at ijw.co.nz>
Date: Mon Mar 17 08:03:38 2014 +1300
mesa: fix packing of float texels to GL_SHORT/GL_BYTE
Previously, we would unpack the texels to floats using *_TO_FLOAT_TEX,
and then pack them into the desired format using FLOAT_TO_*. Unfortunately,
this isn't quite the inverse operation, and so some texel values would
end up off-by-one.
This fixes the GL_RGB8_SNORM and GL_RGB16_SNORM subcases in piglit's
arb_texture_view-format-consistency-get test on i965. The similar 1-, 2-
and 4-component cases already worked because they took the memcpy path
rather than repacking.
Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Acked-by: Eric Anholt <eric at anholt.net>
More information about the mesa-commit
mailing list