This patch is:
Reviewed-by: Chris Forbes <chr...@ijw.co.nz>
Spotted some other bugs (in using a view as a depth/stencil
attachment) while reading around this, which I'll take care of.
On Wed, May 7, 2014 at 12:03 PM, Kenneth Graunke <kenn...@whitecape.org> wrote:
> This is a port of commit c9c08867ed07ceb10b67ffac5f0a33812710a5e8.
> A tiny bit of extra work was necessary to not break stencil texturing.
>
> Cc: "10.2" <mesa-sta...@lists.freedesktop.org>
> Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
> ---
> src/mesa/drivers/dri/i965/gen8_surface_state.c | 28
> ++++++++++++++++++--------
> src/mesa/drivers/dri/i965/intel_extensions.c | 5 +----
> 2 files changed, 21 insertions(+), 12 deletions(-)
>
> diff --git a/src/mesa/drivers/dri/i965/gen8_surface_state.c
> b/src/mesa/drivers/dri/i965/gen8_surface_state.c
> index 564d275..d52b32e 100644
> --- a/src/mesa/drivers/dri/i965/gen8_surface_state.c
> +++ b/src/mesa/drivers/dri/i965/gen8_surface_state.c
> @@ -134,17 +134,20 @@ gen8_update_texture_surface(struct gl_context *ctx,
> struct intel_mipmap_tree *mt = intelObj->mt;
> struct gl_texture_image *firstImage = tObj->Image[0][tObj->BaseLevel];
> struct gl_sampler_object *sampler = _mesa_get_samplerobj(ctx, unit);
> + mesa_format format = intelObj->_Format;
>
> if (tObj->Target == GL_TEXTURE_BUFFER) {
> brw_update_buffer_texture_surface(ctx, unit, surf_offset);
> return;
> }
>
> - if (tObj->StencilSampling && firstImage->_BaseFormat == GL_DEPTH_STENCIL)
> + if (tObj->StencilSampling && firstImage->_BaseFormat == GL_DEPTH_STENCIL)
> {
> mt = mt->stencil_mt;
> + format = MESA_FORMAT_S_UINT8;
> + }
>
> unsigned tiling_mode, pitch;
> - if (mt->format == MESA_FORMAT_S_UINT8) {
> + if (format == MESA_FORMAT_S_UINT8) {
> tiling_mode = GEN8_SURFACE_TILING_W;
> pitch = 2 * mt->pitch;
> } else {
> @@ -152,9 +155,14 @@ gen8_update_texture_surface(struct gl_context *ctx,
> pitch = mt->pitch;
> }
>
> - uint32_t tex_format = translate_tex_format(brw,
> - mt->format,
> - sampler->sRGBDecode);
> + /* If this is a view with restricted NumLayers, then our effective depth
> + * is not just the miptree depth.
> + */
> + uint32_t effective_depth =
> + (tObj->Immutable && tObj->Target != GL_TEXTURE_3D) ? tObj->NumLayers
> + :
> mt->logical_depth0;
> +
> + uint32_t tex_format = translate_tex_format(brw, format,
> sampler->sRGBDecode);
>
> uint32_t *surf = brw_state_batch(brw, AUB_TRACE_SURFACE_STATE,
> 13 * 4, 64, surf_offset);
> @@ -178,11 +186,15 @@ gen8_update_texture_surface(struct gl_context *ctx,
> surf[2] = SET_FIELD(mt->logical_width0 - 1, GEN7_SURFACE_WIDTH) |
> SET_FIELD(mt->logical_height0 - 1, GEN7_SURFACE_HEIGHT);
>
> - surf[3] = SET_FIELD(mt->logical_depth0 - 1, BRW_SURFACE_DEPTH) | (pitch -
> 1);
> + surf[3] = SET_FIELD(effective_depth - 1, BRW_SURFACE_DEPTH) | (pitch - 1);
>
> - surf[4] = gen7_surface_msaa_bits(mt->num_samples, mt->msaa_layout);
> + surf[4] = gen7_surface_msaa_bits(mt->num_samples, mt->msaa_layout) |
> + SET_FIELD(tObj->MinLayer, GEN7_SURFACE_MIN_ARRAY_ELEMENT) |
> + SET_FIELD(effective_depth - 1,
> + GEN7_SURFACE_RENDER_TARGET_VIEW_EXTENT);
>
> - surf[5] = SET_FIELD(tObj->BaseLevel - mt->first_level,
> GEN7_SURFACE_MIN_LOD) |
> + surf[5] = SET_FIELD(tObj->MinLevel + tObj->BaseLevel - mt->first_level,
> + GEN7_SURFACE_MIN_LOD) |
> (intelObj->_MaxLevel - tObj->BaseLevel); /* mip count */
>
> surf[6] = 0;
> diff --git a/src/mesa/drivers/dri/i965/intel_extensions.c
> b/src/mesa/drivers/dri/i965/intel_extensions.c
> index ade86a5..c6c76c2 100644
> --- a/src/mesa/drivers/dri/i965/intel_extensions.c
> +++ b/src/mesa/drivers/dri/i965/intel_extensions.c
> @@ -284,6 +284,7 @@ intelInitExtensions(struct gl_context *ctx)
>
> if (brw->gen >= 7) {
> ctx->Extensions.ARB_conservative_depth = true;
> + ctx->Extensions.ARB_texture_view = true;
> ctx->Extensions.AMD_vertex_shader_layer = true;
> if (can_do_pipelined_register_writes(brw)) {
> ctx->Extensions.ARB_transform_feedback2 = true;
> @@ -302,10 +303,6 @@ intelInitExtensions(struct gl_context *ctx)
> ctx->Extensions.ARB_compute_shader = true;
> }
>
> - if (brw->gen == 7) {
> - ctx->Extensions.ARB_texture_view = true;
> - }
> -
> if (brw->gen >= 8) {
> ctx->Extensions.ARB_stencil_texturing = true;
> }
> --
> 1.9.1
>
> _______________________________________________
> mesa-stable mailing list
> mesa-sta...@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-stable
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
