Mesa (master): Revert "i965: Fix depth (array slices) computation for 1D_ARRAY render targets."

[Kenneth Graunke]

Module: Mesa
Branch: master
Commit: 155f98d49fdc2f46c760f8214327b3804ee60079
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=155f98d49fdc2f46c760f8214327b3804ee60079

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Fri May  9 14:45:57 2014 -0700

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 at lists.freedesktop.org>

---

 src/mesa/drivers/dri/i965/gen7_wm_surface_state.c |    2 --
 src/mesa/drivers/dri/i965/gen8_surface_state.c    |    3 ---
 2 files changed, 5 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;
diff --git a/src/mesa/drivers/dri/i965/gen8_surface_state.c b/src/mesa/drivers/dri/i965/gen8_surface_state.c
index 66b9879..fd9222d 100644
--- a/src/mesa/drivers/dri/i965/gen8_surface_state.c
+++ b/src/mesa/drivers/dri/i965/gen8_surface_state.c
@@ -293,9 +293,6 @@ gen8_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;