fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel: Fix region dimensions for stencil buffers received from DDX

Browse source 
I changed the dimensions of the stencil buffer's region, as allocated by
the DDX, at xf86-video-intel commit
   commit 3e55f3e88b40471706d5cd45c4df4010f8675c75
   dri: Do not tile stencil buffer
But I forgot to make the analogous update to the Intel DRI2 glue in Mesa.
This patch makes that update.

Surprisingly, the mismatch did not cause any bugs. But the mismatch, if
left unfixed, *would* create bugs in the next commit.

Note: This is a candidate for the 7.11 branch.
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
(cherry picked from commit 50b3356078)
This commit is contained in:
Chad Versace 2011-11-15 07:21:25 -08:00
parent fd35fab340
commit 68060d6bfd
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/mesa/drivers/dri/intel/intel_context.c
View file

@ -1334,27 +1334,28 @@ intel_process_dri2_buffer_with_separate_stencil(struct intel_context *intel,
buffer->cpp, buffer->pitch);
}
/*
* The stencil buffer has quirky pitch requirements. From Section
* 2.11.5.6.2.1 3DSTATE_STENCIL_BUFFER, field "Surface Pitch":
* The pitch must be set to 2x the value computed based on width, as
* the stencil buffer is stored with two rows interleaved.
* If we neglect to double the pitch, then drm_intel_gem_bo_map_gtt()
* maps the memory incorrectly.
*
* To satisfy the pitch requirement, the X driver hackishly allocated
* the gem buffer with bpp doubled and height halved. So buffer->cpp is
* correct, but drawable->height is not.
*/
int buffer_height = drawable->h;
int buffer_width;
int buffer_height;
if (buffer->attachment == __DRI_BUFFER_STENCIL) {
buffer_height /= 2;
/* The stencil buffer has quirky pitch requirements. From Section
* 2.11.5.6.2.1 3DSTATE_STENCIL_BUFFER, field "Surface Pitch":
* The pitch must be set to 2x the value computed based on width, as
* the stencil buffer is stored with two rows interleaved.
*
* To satisfy the pitch requirement, the X driver allocated the region
* with the following dimensions.
*/
buffer_width = ALIGN(drawable->w, 64);
buffer_height = ALIGN(ALIGN(drawable->h, 2) / 2, 64);
} else {
buffer_width = drawable->w;
buffer_height = drawable->h;
}
struct intel_region *region =
intel_region_alloc_for_handle(intel->intelScreen,
buffer->cpp,
drawable->w,
buffer_width,
buffer_height,
buffer->pitch / buffer->cpp,
buffer->name,