diff options
| author | Brian Paul <brianp@vmware.com> | 2010-12-02 08:20:08 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-12-02 10:09:03 -0700 |
| commit | 4b08f35487fa439fd9ca4d653d3a146c3dc09c1c (patch) | |
| tree | 35fed9d63a68b7ec4c065245d07acc3cfe848796 /src/mesa/main/config.h | |
| parent | 23390e2f5cf1050f98c70c8603e374191e7d84e7 (diff) | |
| download | external_mesa3d-4b08f35487fa439fd9ca4d653d3a146c3dc09c1c.zip external_mesa3d-4b08f35487fa439fd9ca4d653d3a146c3dc09c1c.tar.gz external_mesa3d-4b08f35487fa439fd9ca4d653d3a146c3dc09c1c.tar.bz2 | |
mesa: raise max texture sizes to 16K
This allows 16K x 16K 2D textures, for example, but we don't want to
allow that for 3D textures. The new gl_constants::MaxTextureMBytes
field is used to prevent allocating too large of texture image.
This allows a 16K x 32 x 32 3D texture, for example, but prevents 16K^3.
Drivers can override this limit. The default is currently 1GB.
Apps should use the proxy texture mechanism to determine the actual
max texture size.
Diffstat (limited to 'src/mesa/main/config.h')
| -rw-r--r-- | src/mesa/main/config.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h index 0f2d1a8..ff77bd0 100644 --- a/src/mesa/main/config.h +++ b/src/mesa/main/config.h @@ -97,17 +97,20 @@ /** Max texture palette / color table size */ #define MAX_COLOR_TABLE_SIZE 256 +/** Max memory to allow for a single texture image (in megabytes) */ +#define MAX_TEXTURE_MBYTES 1024 + /** Number of 1D/2D texture mipmap levels */ -#define MAX_TEXTURE_LEVELS 13 +#define MAX_TEXTURE_LEVELS 15 /** Number of 3D texture mipmap levels */ -#define MAX_3D_TEXTURE_LEVELS 9 +#define MAX_3D_TEXTURE_LEVELS 15 /** Number of cube texture mipmap levels - GL_ARB_texture_cube_map */ -#define MAX_CUBE_TEXTURE_LEVELS 13 +#define MAX_CUBE_TEXTURE_LEVELS 15 /** Maximum rectangular texture size - GL_NV_texture_rectangle */ -#define MAX_TEXTURE_RECT_SIZE 4096 +#define MAX_TEXTURE_RECT_SIZE 16384 /** Maximum number of layers in a 1D or 2D array texture - GL_MESA_texture_array */ #define MAX_ARRAY_TEXTURE_LAYERS 64 @@ -140,11 +143,11 @@ */ #ifndef MAX_WIDTH -# define MAX_WIDTH 4096 +# define MAX_WIDTH 16384 #endif /** Maximum viewport/image height */ #ifndef MAX_HEIGHT -# define MAX_HEIGHT 4096 +# define MAX_HEIGHT 16384 #endif /** Maxmimum size for CVA. May be overridden by the drivers. */ @@ -168,7 +171,7 @@ #define MAX_TEXTURE_MAX_ANISOTROPY 16.0 /** For GL_EXT_texture_lod_bias (typically MAX_TEXTURE_LEVELS - 1) */ -#define MAX_TEXTURE_LOD_BIAS 12.0 +#define MAX_TEXTURE_LOD_BIAS 14.0 /** For any program target/extension */ /*@{*/ |