diff options
| author | Roland Scheidegger <[email protected]> | 2010-05-21 20:02:22 +0200 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2010-05-21 20:02:22 +0200 |
| commit | 3293bcdc80cdfa20a2381aae2b94505bdf95d857 (patch) | |
| tree | 16ab1ae66010f6d8b1325dbfa9006126a8e95771 /src/gallium/drivers/svga/svga_screen.c | |
| parent | 8504c5d931e47765a15fdaec2df2cb6502a1bd5c (diff) | |
| parent | ce65caba846b03b5ef4144e311b85cfd48ab9bbb (diff) | |
Merge branch 'gallium-msaa'
Conflicts:
src/mesa/state_tracker/st_gen_mipmap.c
src/mesa/state_tracker/st_texture.c
Diffstat (limited to 'src/gallium/drivers/svga/svga_screen.c')
| -rw-r--r-- | src/gallium/drivers/svga/svga_screen.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/gallium/drivers/svga/svga_screen.c b/src/gallium/drivers/svga/svga_screen.c index bef22f41ae5..99b419178b0 100644 --- a/src/gallium/drivers/svga/svga_screen.c +++ b/src/gallium/drivers/svga/svga_screen.c @@ -290,17 +290,21 @@ svga_translate_format_cap(enum pipe_format format) static boolean svga_is_format_supported( struct pipe_screen *screen, - enum pipe_format format, + enum pipe_format format, enum pipe_texture_target target, - unsigned tex_usage, + unsigned sample_count, + unsigned tex_usage, unsigned geom_flags ) { struct svga_winsys_screen *sws = svga_screen(screen)->sws; SVGA3dDevCapIndex index; SVGA3dDevCapResult result; - + assert(tex_usage); + if (sample_count > 1) + return FALSE; + /* Override host capabilities */ if (tex_usage & PIPE_BIND_RENDER_TARGET) { switch(format) { |