On Mon, Jun 09, 2014 at 08:16:57PM +1200, Chris Forbes wrote:
> > @@ -465,8 +471,8 @@ gen7_update_renderbuffer_surface(struct brw_context
> > *brw,
> > bool is_array = false;
> > int depth = MAX2(irb->layer_count, 1);
> > const uint8_t mocs = GEN7_MOCS_L3;
> > -
> > - int min_array_element = irb->mt_layer / MAX2(mt->num_samples, 1);
> > + const int min_array_element = is_stencil(irb->mt) ?
> > + irb->mt_layer : irb->mt_layer / MAX2(mt->num_samples, 1);
> >
> > GLenum gl_target = rb->TexImage ?
> > rb->TexImage->TexObject->Target : GL_TEXTURE_2D;
> > @@ -480,8 +486,11 @@ gen7_update_renderbuffer_surface(struct brw_context
> > *brw,
> >
> > intel_miptree_used_for_rendering(irb->mt);
> >
> > - /* Render targets can't use IMS layout */
> > - assert(irb->mt->msaa_layout != INTEL_MSAA_LAYOUT_IMS);
> > + /* Render targets can't use IMS layout. Stencil in turn gets configured
> > as
> > + * single sampled and indexed manually by the program.
> > + */
>
> It might be worth noting here that the stencil case is not a normal
> stencil attachment, but a stencil
> surface bound to a color attachment for blits. Otherwise it looks
> strange to be handling stencil here at all.
>
> (I assume that's what's happening here, at least?)
That's the case, and I agree. I'll add a clarification.
>
> > + if (!is_stencil(irb->mt))
> > + assert(irb->mt->msaa_layout != INTEL_MSAA_LAYOUT_IMS);
> >
> > assert(brw_render_target_supported(brw, rb));
> > format = brw->render_target_format[rb_format];
> > @@ -533,10 +542,13 @@ gen7_update_renderbuffer_surface(struct brw_context
> > *brw,
> >
> > surf[3] = ((depth - 1) << BRW_SURFACE_DEPTH_SHIFT) | (pitch - 1);
> >
> > - surf[4] = gen7_surface_msaa_bits(irb->mt->num_samples,
> > irb->mt->msaa_layout) |
> > - min_array_element << GEN7_SURFACE_MIN_ARRAY_ELEMENT_SHIFT |
> > + surf[4] = min_array_element << GEN7_SURFACE_MIN_ARRAY_ELEMENT_SHIFT |
> > (depth - 1) << GEN7_SURFACE_RENDER_TARGET_VIEW_EXTENT_SHIFT;
> >
> > + if (!is_stencil(irb->mt))
> > + surf[4] |= gen7_surface_msaa_bits(irb->mt->num_samples,
> > + irb->mt->msaa_layout);
> > +
> > if (irb->mt->mcs_mt) {
> > gen7_set_surface_mcs_info(brw, surf,
> > brw->wm.base.surf_offset[surf_index],
> > irb->mt->mcs_mt, true /* is RT */);
> > --
> > 1.8.3.1
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
