diff options
| author | Eric Anholt <[email protected]> | 2012-01-17 11:28:56 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-01-24 15:39:47 -0800 |
| commit | c256fd094b433fdd955c35f66ad4794a4017b65f (patch) | |
| tree | 42c04d90fc96e49c4a86146fc5255b01e533e999 /src/mesa/drivers | |
| parent | f0662ee6095b8c35e7788882c84f7c276c4bde3a (diff) | |
i965/gen7: Set up surface horizontal alignment field.
This is required for Z16 support for texturing, which is the first
thing to have a horizontal alignment of 8. Renderbuffers don't need
it, since they're always set up as the only mip level, but do it for
completeness anyway.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Chad Versace <[email protected]>
(cherry picked from commit f0d5c92a4c9d5057d727819e501d80c5dfcdf76e)
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_wm_surface_state.c | 5 |
1 files changed, 4 insertions, 1 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 1c6f662551d..940b2947161 100644 --- a/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/gen7_wm_surface_state.c @@ -74,6 +74,8 @@ gen7_update_texture_surface(struct gl_context *ctx, GLuint unit) if (mt->align_h == 4) surf->ss0.vertical_alignment = 1; + if (mt->align_w == 8) + surf->ss0.horizontal_alignment = 1; surf->ss0.surface_type = translate_tex_target(tObj->Target); surf->ss0.surface_format = translate_tex_format(mt->format, @@ -94,7 +96,6 @@ gen7_update_texture_surface(struct gl_context *ctx, GLuint unit) gen7_set_surface_tiling(surf, intelObj->mt->region->tiling); /* ss0 remaining fields: - * - horizontal_alignment * - vert_line_stride (exists on gen6 but we ignore it) * - vert_line_stride_ofs (exists on gen6 but we ignore it) * - surface_array_spacing @@ -206,6 +207,8 @@ gen7_update_renderbuffer_surface(struct brw_context *brw, if (irb->mt->align_h == 4) surf->ss0.vertical_alignment = 1; + if (irb->mt->align_w == 8) + surf->ss0.horizontal_alignment = 1; switch (irb->Base.Format) { case MESA_FORMAT_SARGB8: |