OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel: Simplify stencil detiling arithmetic

Browse Source 
When calculating the y offset needed for detiling window system stencil
buffers, replace the term
   region->height * 2 + region->height % 2 - 1
with
   rb->Height - 1 .

The two terms are incidentally equivalent due to some out-of-date,
incorrect code in the Intel DRI2 glue for DDX. (See
intel_process_dri2_buffer_with_separate_stencil(), line ``buffer_height /=
2;``).

Note: This is a candidate for the 7.11 branch (only the intel_span.c hunk).
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
This commit is contained in:
Chad Versace
2011-11-15 07:10:18 -08:00
parent 1161facaf9
commit dc4c3a31c6
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/drivers/dri/intel/intel_fbo.c
View File

@@ -267,9 +267,8 @@ intel_map_renderbuffer_s8(struct gl_context *ctx,
irb->map_h = h; irb->map_h = h;
/* Flip the Y axis for the default framebuffer. */ /* Flip the Y axis for the default framebuffer. */
int region_h = irb->region->height;
int y_flip = (rb->Name == 0) ? -1 : 1; int y_flip = (rb->Name == 0) ? -1 : 1;
int y_bias = (rb->Name == 0) ? (region_h * 2 + region_h % 2 - 1) : 0; int y_bias = (rb->Name == 0) ? (rb->Height - 1) : 0;
irb->map_buffer = malloc(w * h); irb->map_buffer = malloc(w * h);
untiled_s8_map = irb->map_buffer; untiled_s8_map = irb->map_buffer;
@@ -442,9 +441,8 @@ intel_unmap_renderbuffer_s8(struct gl_context *ctx,
uint8_t *tiled_s8_map = irb->region->bo->virtual; uint8_t *tiled_s8_map = irb->region->bo->virtual;
/* Flip the Y axis for the default framebuffer. */ /* Flip the Y axis for the default framebuffer. */
int region_h = irb->region->height;
int y_flip = (rb->Name == 0) ? -1 : 1; int y_flip = (rb->Name == 0) ? -1 : 1;
int y_bias = (rb->Name == 0) ? (region_h * 2 + region_h % 2 - 1) : 0; int y_bias = (rb->Name == 0) ? (rb->Height - 1) : 0;
for (uint32_t pix_y = 0; pix_y < irb->map_h; pix_y++) { for (uint32_t pix_y = 0; pix_y < irb->map_h; pix_y++) {
for (uint32_t pix_x = 0; pix_x < irb->map_w; pix_x++) { for (uint32_t pix_x = 0; pix_x < irb->map_w; pix_x++) {

3
src/mesa/drivers/dri/intel/intel_span.c
View File

@@ -141,10 +141,9 @@ intel_set_span_functions(struct intel_context *intel,
struct intel_renderbuffer *irb = intel_renderbuffer(rb); \ struct intel_renderbuffer *irb = intel_renderbuffer(rb); \
uint8_t *buf = irb->region->bo->virtual; \ uint8_t *buf = irb->region->bo->virtual; \
unsigned stride = irb->region->pitch; \ unsigned stride = irb->region->pitch; \
unsigned height = irb->region->height; \
bool flip = rb->Name == 0; \ bool flip = rb->Name == 0; \
int y_scale = flip ? -1 : 1; \ int y_scale = flip ? -1 : 1; \
int y_bias = flip ? (height * 2 + height % 2 - 1) : 0; \ int y_bias = flip ? (rb->Height - 1) : 0; \
#undef Y_FLIP #undef Y_FLIP
#define Y_FLIP(y) (y_scale * (y) + y_bias) #define Y_FLIP(y) (y_scale * (y) + y_bias)