KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

osmesa: use SWRAST_MAX_WIDTH/HEIGHT

This commit is contained in:
Brian Paul 2012-02-20 11:07:00 -07:00
parent df22829b9c
commit a3b2c3a421
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/drivers/osmesa/osmesa.c
View File

@ -72,7 +72,7 @@ struct osmesa_context
GLenum format; /*< User-specified context format */ GLenum format; /*< User-specified context format */
GLint userRowLength; /*< user-specified number of pixels per row */ GLint userRowLength; /*< user-specified number of pixels per row */
GLint rInd, gInd, bInd, aInd;/*< index offsets for RGBA formats */ 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 */ GLboolean yup; /*< TRUE -> Y increases upward */
/*< FALSE -> Y increases downward */ /*< FALSE -> Y increases downward */
GLenum DataType; GLenum DataType;
@ -852,7 +852,7 @@ OSMesaMakeCurrent( OSMesaContext osmesa, void *buffer, GLenum type,
{ {
if (!osmesa || !buffer || if (!osmesa || !buffer ||
width < 1 || height < 1 || width < 1 || height < 1 ||
width > MAX_WIDTH || height > MAX_HEIGHT) { width > SWRAST_MAX_WIDTH || height > SWRAST_MAX_HEIGHT) {
return GL_FALSE; return GL_FALSE;
} }
@ -998,10 +998,10 @@ OSMesaGetIntegerv( GLint pname, GLint *value )
*value = osmesa->yup; *value = osmesa->yup;
return; return;
case OSMESA_MAX_WIDTH: case OSMESA_MAX_WIDTH:
*value = MAX_WIDTH; *value = SWRAST_MAX_WIDTH;
return; return;
case OSMESA_MAX_HEIGHT: case OSMESA_MAX_HEIGHT:
*value = MAX_HEIGHT; *value = SWRAST_MAX_HEIGHT;
return; return;
default: default:
_mesa_error(&osmesa->mesa, GL_INVALID_ENUM, "OSMesaGetIntergerv(pname)"); _mesa_error(&osmesa->mesa, GL_INVALID_ENUM, "OSMesaGetIntergerv(pname)");