fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

i965/Gen8: Set up layer constraints properly for renderbuffers

Browse source 
Fixing the same issues the previous commit does for Gen7.

Note that I can't test this one, since I don't have a Broadwell.

V2: Restore the MAX2() to account for zero depth/layer_count.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Chris Forbes 2014-05-08 17:15:59 +12:00
parent dd43900b7b
commit 9269ea599c
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mesa/drivers/dri/i965/gen8_surface_state.c
View file

@ -287,8 +287,8 @@ gen8_update_renderbuffer_surface(struct brw_context *brw,
uint32_t format = 0;
uint32_t surf_type;
bool is_array = false;
int depth = MAX2(rb->Depth, 1);
int min_array_element;
int depth = MAX2(irb->layer_count, 1);
int min_array_element = irb->mt_layer / MAX2(mt->num_samples, 1);
GLenum gl_target =
rb->TexImage ? rb->TexImage->TexObject->Target : GL_TEXTURE_2D;
@ -311,20 +311,15 @@ gen8_update_renderbuffer_surface(struct brw_context *brw,
is_array = true;
depth *= 6;
break;
case GL_TEXTURE_3D:
depth = MAX2(rb->Depth, 1);
/* fallthrough */
default:
surf_type = translate_tex_target(gl_target);
is_array = _mesa_tex_target_is_array(gl_target);
break;
}
if (layered) {
min_array_element = 0;
} else if (mt->num_samples > 1) {
min_array_element = irb->mt_layer / mt->num_samples;
} else {
min_array_element = irb->mt_layer;
}
/* _NEW_BUFFERS */
mesa_format rb_format = _mesa_get_render_format(ctx, intel_rb_format(irb));
assert(brw_render_target_supported(brw, rb));