diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-05-21 20:02:22 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-05-21 20:02:22 +0200 |
| commit | 3293bcdc80cdfa20a2381aae2b94505bdf95d857 (patch) | |
| tree | 16ab1ae66010f6d8b1325dbfa9006126a8e95771 /src/gallium/auxiliary/util/u_caps.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/auxiliary/util/u_caps.c')
| -rw-r--r-- | src/gallium/auxiliary/util/u_caps.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/util/u_caps.c b/src/gallium/auxiliary/util/u_caps.c index c7c1e830e01..294ee37033d 100644 --- a/src/gallium/auxiliary/util/u_caps.c +++ b/src/gallium/auxiliary/util/u_caps.c @@ -68,6 +68,7 @@ util_check_caps_out(struct pipe_screen *screen, const unsigned *list, int *out) if (!screen->is_format_supported(screen, list[i++], PIPE_TEXTURE_2D, + 0, PIPE_BIND_SAMPLER_VIEW, 0)) { *out = i - 2; |