diff options
| -rw-r--r-- | src/gallium/drivers/r600/evergreen_state.c | 11 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_state.c | 11 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 11 |
3 files changed, 24 insertions, 9 deletions
diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 4535d219dd1..a4a4e3e9451 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -711,9 +711,14 @@ boolean evergreen_is_format_supported(struct pipe_screen *screen, } } - if ((usage & PIPE_BIND_SAMPLER_VIEW) && - r600_is_sampler_format_supported(screen, format)) { - retval |= PIPE_BIND_SAMPLER_VIEW; + if (usage & PIPE_BIND_SAMPLER_VIEW) { + if (target == PIPE_BUFFER) { + if (r600_is_vertex_format_supported(format)) + retval |= PIPE_BIND_SAMPLER_VIEW; + } else { + if (r600_is_sampler_format_supported(screen, format)) + retval |= PIPE_BIND_SAMPLER_VIEW; + } } if ((usage & (PIPE_BIND_RENDER_TARGET | diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index f1480526587..41e9c5dfbdb 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -649,9 +649,14 @@ boolean r600_is_format_supported(struct pipe_screen *screen, } } - if ((usage & PIPE_BIND_SAMPLER_VIEW) && - r600_is_sampler_format_supported(screen, format)) { - retval |= PIPE_BIND_SAMPLER_VIEW; + if (usage & PIPE_BIND_SAMPLER_VIEW) { + if (target == PIPE_BUFFER) { + if (r600_is_vertex_format_supported(format)) + retval |= PIPE_BIND_SAMPLER_VIEW; + } else { + if (r600_is_sampler_format_supported(screen, format)) + retval |= PIPE_BIND_SAMPLER_VIEW; + } } if ((usage & (PIPE_BIND_RENDER_TARGET | diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 36aff008057..0d743445f7b 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -1497,9 +1497,14 @@ boolean si_is_format_supported(struct pipe_screen *screen, } } - if ((usage & PIPE_BIND_SAMPLER_VIEW) && - si_is_sampler_format_supported(screen, format)) { - retval |= PIPE_BIND_SAMPLER_VIEW; + if (usage & PIPE_BIND_SAMPLER_VIEW) { + if (target == PIPE_BUFFER) { + if (si_is_vertex_format_supported(screen, format)) + retval |= PIPE_BIND_SAMPLER_VIEW; + } else { + if (si_is_sampler_format_supported(screen, format)) + retval |= PIPE_BIND_SAMPLER_VIEW; + } } if ((usage & (PIPE_BIND_RENDER_TARGET | |