diff options
author | Brian Paul <brianp@vmware.com> | 2009-05-18 10:36:50 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-05-18 10:36:50 -0600 |
commit | edfbf7dccb1d90ebedfa08fe06e1db7fff9f94d4 (patch) | |
tree | 0e224de2fac2fc5c632b2398a372b658c66a36d7 /src/gallium | |
parent | 27206add2738f9813d1e9f42fe3b1bdfbd9b8aa4 (diff) | |
parent | 7ce105d2e6885eeac73c59dc14c4cd59a89c1425 (diff) |
Merge branch 'mesa_7_5_branch'
Conflicts:
Makefile
src/mesa/main/version.h
Diffstat (limited to 'src/gallium')
-rw-r--r-- | src/gallium/drivers/softpipe/sp_screen.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c index 7380a6ae2b..a32fd3a1ba 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -127,6 +127,11 @@ softpipe_is_format_supported( struct pipe_screen *screen, unsigned tex_usage, unsigned geom_flags ) { + assert(target == PIPE_TEXTURE_1D || + target == PIPE_TEXTURE_2D || + target == PIPE_TEXTURE_3D || + target == PIPE_TEXTURE_CUBE); + switch(format) { case PIPE_FORMAT_DXT1_RGB: case PIPE_FORMAT_DXT1_RGBA: |