diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-27 07:40:19 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-27 07:40:19 +0100 |
| commit | b3e4046e8fdcd369e61c237f8690772bf1d8c64f (patch) | |
| tree | 5ff8cf47771eede4f2ea6e7c5980fd584f2b4992 /mesalib/src/mesa/drivers | |
| parent | b436c1b7e3adefe7068fb030b83ac12a826251d3 (diff) | |
| parent | c4f44c07c6662d1ce08603945ccc4fa5afaa742a (diff) | |
| download | vcxsrv-b3e4046e8fdcd369e61c237f8690772bf1d8c64f.tar.gz vcxsrv-b3e4046e8fdcd369e61c237f8690772bf1d8c64f.tar.bz2 vcxsrv-b3e4046e8fdcd369e61c237f8690772bf1d8c64f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-mmx.c
Diffstat (limited to 'mesalib/src/mesa/drivers')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/swrast/swrast.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/windows/gdi/wgl.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c index ff26e2769..bfac47c08 100644 --- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c +++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c @@ -474,7 +474,7 @@ dri_create_buffer(__DRIscreen * sPriv, dPriv->driverPrivate = drawable; drawable->dPriv = dPriv; - drawable->row = malloc(MAX_WIDTH * 4); + drawable->row = malloc(SWRAST_MAX_WIDTH * 4); if (drawable->row == NULL) goto drawable_fail; diff --git a/mesalib/src/mesa/drivers/windows/gdi/wgl.c b/mesalib/src/mesa/drivers/windows/gdi/wgl.c index 61850c26f..d99473bb3 100644 --- a/mesalib/src/mesa/drivers/windows/gdi/wgl.c +++ b/mesalib/src/mesa/drivers/windows/gdi/wgl.c @@ -33,6 +33,7 @@ #include "main/config.h" #include "glapi/glapi.h" +#include "swrast/swrast.h" #include "GL/wmesa.h" /* protos for wmesa* functions */ /* |