diff options
| author | Brian Paul <[email protected]> | 2009-09-24 16:06:21 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-09-24 16:06:21 -0600 |
| commit | 29d27229a95837d085db785a2b4abb654457dafa (patch) | |
| tree | 0a03c9dbe3e55fa9676137750da1ee465379b978 /src/gallium | |
| parent | fd56bee6c4de28da194333f93b52c40f1deb6163 (diff) | |
| parent | 940ca2e837efe45caae1cf1d9665f6736347705d (diff) | |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/mesa/vbo/vbo_exec_array.c
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_screen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c index 6cf45cded23..3c61357eba8 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -82,7 +82,7 @@ softpipe_get_param(struct pipe_screen *screen, int param) case PIPE_CAP_MAX_TEXTURE_2D_LEVELS: return 13; /* max 4Kx4K */ case PIPE_CAP_MAX_TEXTURE_3D_LEVELS: - return 8; /* max 128x128x128 */ + return 9; /* max 256x256x256 */ case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS: return 13; /* max 4Kx4K */ case PIPE_CAP_TGSI_CONT_SUPPORTED: |