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

i965: Fix readpixels from ReadBuffer != DrawBuffer.

Browse Source 
Fixes piglit fbo-readdrawpix.
This commit is contained in:
Eric Anholt
2010-03-16 13:23:23 -07:00
parent a589da14de
commit 5782b2a968
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,11 +48,11 @@ intel_set_span_functions(struct intel_context *intel,
#define LOCAL_VARS \ #define LOCAL_VARS \
struct intel_renderbuffer *irb = intel_renderbuffer(rb); \ struct intel_renderbuffer *irb = intel_renderbuffer(rb); \
const GLint yScale = ctx->DrawBuffer->Name ? 1 : -1; \ const GLint yScale = rb->Name ? 1 : -1; \
const GLint yBias = ctx->DrawBuffer->Name ? 0 : irb->Base.Height - 1;\ const GLint yBias = rb->Name ? 0 : rb->Height - 1; \
int minx = 0, miny = 0; \ int minx = 0, miny = 0; \
int maxx = ctx->DrawBuffer->Width; \ int maxx = rb->Width; \
int maxy = ctx->DrawBuffer->Height; \ int maxy = rb->Height; \
int pitch = irb->region->pitch * irb->region->cpp; \ int pitch = irb->region->pitch * irb->region->cpp; \
void *buf = irb->region->buffer->virtual; \ void *buf = irb->region->buffer->virtual; \
GLuint p; \ GLuint p; \
@@ -108,11 +108,11 @@ intel_set_span_functions(struct intel_context *intel,
#define LOCAL_DEPTH_VARS \ #define LOCAL_DEPTH_VARS \
struct intel_renderbuffer *irb = intel_renderbuffer(rb); \ struct intel_renderbuffer *irb = intel_renderbuffer(rb); \
const GLint yScale = ctx->DrawBuffer->Name ? 1 : -1; \ const GLint yScale = rb->Name ? 1 : -1; \
const GLint yBias = ctx->DrawBuffer->Name ? 0 : irb->Base.Height - 1;\ const GLint yBias = rb->Name ? 0 : rb->Height - 1; \
int minx = 0, miny = 0; \ int minx = 0, miny = 0; \
int maxx = ctx->DrawBuffer->Width; \ int maxx = rb->Width; \
int maxy = ctx->DrawBuffer->Height; \ int maxy = rb->Height; \
int pitch = irb->region->pitch * irb->region->cpp; \ int pitch = irb->region->pitch * irb->region->cpp; \
void *buf = irb->region->buffer->virtual; \ void *buf = irb->region->buffer->virtual; \
(void)buf; (void)pitch; /* unused for non-gttmap. */ \ (void)buf; (void)pitch; /* unused for non-gttmap. */ \