diff options
| author | Emil Velikov <[email protected]> | 2015-04-01 15:51:59 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-04-01 19:43:34 +0000 |
| commit | d99135b2e9b7599ee57ac90952c605b725239908 (patch) | |
| tree | 02f7c64f4fd9446f5b42a7717a538e5f9bb8bc71 | |
| parent | bd4925c6ac468e80f6106f3d684119498b606a0d (diff) | |
configure: nuke --with-max-{width,height}
Unused as of commit 630ab0d27ba(mesa: remove last of MAX_WIDTH,
MAX_HEIGHT). Update all the remaining references to the defines.
v2: Use the correct variable name in the comments
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | configure.ac | 15 | ||||
| -rw-r--r-- | include/GL/osmesa.h | 6 | ||||
| -rw-r--r-- | src/gallium/state_trackers/glx/xlib/glx_api.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/fakeglx.c | 2 |
4 files changed, 4 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index 3d8e0c61f26..4ed4b744f78 100644 --- a/configure.ac +++ b/configure.ac @@ -1832,21 +1832,6 @@ if ! echo "$egl_platforms" | grep -q 'x11'; then GL_PC_CFLAGS="$GL_PC_CFLAGS -DMESA_EGL_NO_X11_HEADERS" fi -AC_ARG_WITH([max-width], - [AS_HELP_STRING([--with-max-width=N], - [Maximum framebuffer width (4096)])], - [DEFINES="${DEFINES} -DMAX_WIDTH=${withval}"; - AS_IF([test "${withval}" -gt "4096"], - [AC_MSG_WARN([Large framebuffer: see s_tritemp.h comments.])])] -) -AC_ARG_WITH([max-height], - [AS_HELP_STRING([--with-max-height=N], - [Maximum framebuffer height (4096)])], - [DEFINES="${DEFINES} -DMAX_HEIGHT=${withval}"; - AS_IF([test "${withval}" -gt "4096"], - [AC_MSG_WARN([Large framebuffer: see s_tritemp.h comments.])])] -) - dnl dnl Gallium LLVM dnl diff --git a/include/GL/osmesa.h b/include/GL/osmesa.h index 16ee89ae446..ca0d1675a9d 100644 --- a/include/GL/osmesa.h +++ b/include/GL/osmesa.h @@ -41,10 +41,8 @@ * OSMesaGetIntegerv - return OSMesa state parameters * * - * The limits on the width and height of an image buffer are MAX_WIDTH and - * MAX_HEIGHT as defined in Mesa/src/config.h. Defaults are 1280 and 1024. - * You can increase them as needed but beware that many temporary arrays in - * Mesa are dimensioned by MAX_WIDTH or MAX_HEIGHT. + * The limits on the width and height of an image buffer can be retrieved + * via OSMesaGetIntegerv(OSMESA_MAX_WIDTH/OSMESA_MAX_HEIGHT). */ diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c index f9572b7d3b3..0508255c4be 100644 --- a/src/gallium/state_trackers/glx/xlib/glx_api.c +++ b/src/gallium/state_trackers/glx/xlib/glx_api.c @@ -1636,7 +1636,7 @@ get_config( XMesaVisual xmvis, int attrib, int *value, GLboolean fbconfig ) case GLX_MAX_PBUFFER_WIDTH: if (!fbconfig) return GLX_BAD_ATTRIBUTE; - /* XXX or MAX_WIDTH? */ + /* XXX should be same as ctx->Const.MaxRenderbufferSize */ *value = DisplayWidth(xmvis->display, xmvis->visinfo->screen); break; case GLX_MAX_PBUFFER_HEIGHT: diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c index 4fd6d758da9..9286f718d00 100644 --- a/src/mesa/drivers/x11/fakeglx.c +++ b/src/mesa/drivers/x11/fakeglx.c @@ -1720,7 +1720,7 @@ get_config( XMesaVisual xmvis, int attrib, int *value, GLboolean fbconfig ) case GLX_MAX_PBUFFER_WIDTH: if (!fbconfig) return GLX_BAD_ATTRIBUTE; - /* XXX or MAX_WIDTH? */ + /* XXX should be same as ctx->Const.MaxRenderbufferSize */ *value = DisplayWidth(xmvis->display, xmvis->visinfo->screen); break; case GLX_MAX_PBUFFER_HEIGHT: |