From 68060d6bfdd5b71f592828a476d8314587c684d9 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Tue, 15 Nov 2011 07:21:25 -0800 Subject: [PATCH] intel: Fix region dimensions for stencil buffers received from DDX 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 (cherry picked from commit 50b33560784dde428fbb5dfe7d428255874c496c) --- src/mesa/drivers/dri/intel/intel_context.c | 31 +++++++++++----------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 679790ff360..c148d2b4c7f 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -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,