aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2012-02-20 11:07:00 -0700
committerBrian Paul <[email protected]>2012-02-24 08:03:10 -0700
commita3b2c3a4211f72b82d1061a94447cdbc1321ab8e (patch)
treecdb77d04f4f7d85495223703bcb7e3d9c09645e4 /src
parentdf22829b9c984a826a0b2e39dd6badac2029996d (diff)
osmesa: use SWRAST_MAX_WIDTH/HEIGHT
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/osmesa/osmesa.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index b7672403335..e594548a630 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -72,7 +72,7 @@ struct osmesa_context
GLenum format; /*< User-specified context format */
GLint userRowLength; /*< user-specified number of pixels per row */
GLint rInd, gInd, bInd, aInd;/*< index offsets for RGBA formats */
- GLvoid *rowaddr[MAX_HEIGHT]; /*< address of first pixel in each image row */
+ GLvoid *rowaddr[SWRAST_MAX_HEIGHT]; /*< address of first pixel in each image row */
GLboolean yup; /*< TRUE -> Y increases upward */
/*< FALSE -> Y increases downward */
GLenum DataType;
@@ -852,7 +852,7 @@ OSMesaMakeCurrent( OSMesaContext osmesa, void *buffer, GLenum type,
{
if (!osmesa || !buffer ||
width < 1 || height < 1 ||
- width > MAX_WIDTH || height > MAX_HEIGHT) {
+ width > SWRAST_MAX_WIDTH || height > SWRAST_MAX_HEIGHT) {
return GL_FALSE;
}
@@ -998,10 +998,10 @@ OSMesaGetIntegerv( GLint pname, GLint *value )
*value = osmesa->yup;
return;
case OSMESA_MAX_WIDTH:
- *value = MAX_WIDTH;
+ *value = SWRAST_MAX_WIDTH;
return;
case OSMESA_MAX_HEIGHT:
- *value = MAX_HEIGHT;
+ *value = SWRAST_MAX_HEIGHT;
return;
default:
_mesa_error(&osmesa->mesa, GL_INVALID_ENUM, "OSMesaGetIntergerv(pname)");