summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2014-05-09 14:45:57 -0700
committerKenneth Graunke <kenneth@whitecape.org>2014-05-09 20:08:38 -0700
commit155f98d49fdc2f46c760f8214327b3804ee60079 (patch)
tree5e435a80199cacae9cad557c2cec5b36a8b15b3e /src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
parenta3e78bab7fdc906bf2f4850094885b59ca3c6d08 (diff)
downloadexternal_mesa3d-155f98d49fdc2f46c760f8214327b3804ee60079.zip
external_mesa3d-155f98d49fdc2f46c760f8214327b3804ee60079.tar.gz
external_mesa3d-155f98d49fdc2f46c760f8214327b3804ee60079.tar.bz2
Revert "i965: Fix depth (array slices) computation for 1D_ARRAY render targets."
This reverts commit e6967270c75a5b669152127bb7a746d55f4407a6. Chris Forbes pointed out that this is broken for texture views which restrict the number of slices. He committed a better fix which makes this unnecessary. Cc: "10.2" <mesa-stable@lists.freedesktop.org>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen7_wm_surface_state.c')
-rw-r--r--src/mesa/drivers/dri/i965/gen7_wm_surface_state.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
index 819835d..5e3d23e 100644
--- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c
@@ -461,8 +461,6 @@ gen7_update_renderbuffer_surface(struct brw_context *brw,
GLenum gl_target = rb->TexImage ?
rb->TexImage->TexObject->Target : GL_TEXTURE_2D;
- if (gl_target == GL_TEXTURE_1D_ARRAY)
- depth = MAX2(rb->Height, 1);
uint32_t surf_index =
brw->wm.prog_data->binding_table.render_target_start + unit;