diff options
| author | Chris Forbes <chrisf@ijw.co.nz> | 2014-05-08 17:15:59 +1200 |
|---|---|---|
| committer | Jordan Justen <jordan.l.justen@intel.com> | 2014-05-14 12:16:50 -0700 |
| commit | 725a27e04dd3523b75130b510df0b9624c1d78a0 (patch) | |
| tree | d40bb13c2562c7bd120db130c3e6a1aee0ca06bc /src/mesa | |
| parent | b0609b715b5e1931d0b23a17e0ce6a4eac25fa90 (diff) | |
i965/Gen8: Set up layer constraints properly for renderbuffers
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>
(cherry picked from commit 9269ea599cf8b22577fe4dc5996535f2cc0b7950)
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen8_surface_state.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/mesa/drivers/dri/i965/gen8_surface_state.c b/src/mesa/drivers/dri/i965/gen8_surface_state.c index d52b32ecd87..fd9222daa06 100644 --- a/src/mesa/drivers/dri/i965/gen8_surface_state.c +++ b/src/mesa/drivers/dri/i965/gen8_surface_state.c @@ -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; @@ -308,20 +308,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)); |