diff options
| author | Michel Dänzer <[email protected]> | 2010-03-26 18:42:16 +0100 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2010-03-26 18:42:16 +0100 |
| commit | feb619b7705897ca723e8fe728f739932f743327 (patch) | |
| tree | 9c972bf3d54efd9476233a17202124eac2ac4ae6 /src/mesa/drivers/dri/swrast/swrast_span.c | |
| parent | 3ae082f00cad3f2323a3747fe3b6f02b8f8c5285 (diff) | |
| parent | 7996f0fc2c167c84552701be7a48d20a897e7978 (diff) | |
Merge branch '7.8'
Conflicts:
src/mesa/drivers/dri/intel/intel_mipmap_tree.c - left what was in master
Diffstat (limited to 'src/mesa/drivers/dri/swrast/swrast_span.c')
| -rw-r--r-- | src/mesa/drivers/dri/swrast/swrast_span.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/swrast/swrast_span.c b/src/mesa/drivers/dri/swrast/swrast_span.c index c5681e34a91..c7d0bfdac72 100644 --- a/src/mesa/drivers/dri/swrast/swrast_span.c +++ b/src/mesa/drivers/dri/swrast/swrast_span.c @@ -236,7 +236,7 @@ static const GLubyte kernel[16] = { struct swrast_renderbuffer *xrb = swrast_renderbuffer(rb); #define INIT_PIXEL_PTR(P, X, Y) \ GLushort *P = (GLushort *)row; -#define INC_PIXEL_PTR(P) P += 2 +#define INC_PIXEL_PTR(P) P++ #define STORE_PIXEL(DST, X, Y, VALUE) \ STORE_PIXEL_R5G6B5(DST, X, Y, VALUE) #define FETCH_PIXEL(DST, SRC) \ |