aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Glisse2012-06-11 14:01:12 -0500
committerJerome Glisse2012-06-11 14:01:12 -0500
commit325e2e52a96ede6a19e891f769c803cb9ba85e10 (patch)
tree60497da005020a6ea5caf01d5bf0dc4b654d77ce /radeon/radeon_surface.c
parent9e0026d35c56374b53a0b3837e24412bc9a4d8c9 (diff)
downloadexternal-libdrm-325e2e52a96ede6a19e891f769c803cb9ba85e10.tar.gz
external-libdrm-325e2e52a96ede6a19e891f769c803cb9ba85e10.tar.xz
external-libdrm-325e2e52a96ede6a19e891f769c803cb9ba85e10.zip
radeon: always properly initialize stencil_offset field
Reported-by: Vadim Girlin <vadimgirlin@gmail.com> Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Diffstat (limited to 'radeon/radeon_surface.c')
-rw-r--r--radeon/radeon_surface.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/radeon/radeon_surface.c b/radeon/radeon_surface.c
index adf209d0..704d8e79 100644
--- a/radeon/radeon_surface.c
+++ b/radeon/radeon_surface.c
@@ -565,8 +565,6 @@ static int eg_surface_init_1d(struct radeon_surface_manager *surf_man,
565 tilew = 8; 565 tilew = 8;
566 xalign = surf_man->hw_info.group_bytes / (tilew * surf->bpe * surf->nsamples); 566 xalign = surf_man->hw_info.group_bytes / (tilew * surf->bpe * surf->nsamples);
567 if (surf->flags & RADEON_SURF_SBUFFER) { 567 if (surf->flags & RADEON_SURF_SBUFFER) {
568 surf->stencil_offset = 0;
569 surf->stencil_tile_split = 0;
570 xalign = surf_man->hw_info.group_bytes / (tilew * surf->nsamples); 568 xalign = surf_man->hw_info.group_bytes / (tilew * surf->nsamples);
571 } 569 }
572 xalign = MAX2(tilew, xalign); 570 xalign = MAX2(tilew, xalign);
@@ -607,7 +605,6 @@ static int eg_surface_init_2d(struct radeon_surface_manager *surf_man,
607 unsigned slice_pt; 605 unsigned slice_pt;
608 unsigned i; 606 unsigned i;
609 607
610 surf->stencil_offset = 0;
611 /* compute tile values */ 608 /* compute tile values */
612 tilew = 8; 609 tilew = 8;
613 tileh = 8; 610 tileh = 8;
@@ -749,6 +746,9 @@ static int eg_surface_init(struct radeon_surface_manager *surf_man,
749 return r; 746 return r;
750 } 747 }
751 748
749 surf->stencil_offset = 0;
750 surf->stencil_tile_split = 0;
751
752 /* check tiling mode */ 752 /* check tiling mode */
753 switch (mode) { 753 switch (mode) {
754 case RADEON_SURF_MODE_LINEAR: 754 case RADEON_SURF_MODE_LINEAR: