diff options
| author | Marek Olšák <[email protected]> | 2013-08-16 15:21:45 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-08-17 01:48:25 +0200 |
| commit | 21d9a1b5ef51ce449e9a82641d0d605c5448b41c (patch) | |
| tree | c27903c03f6439b84dec6436bb24f86d24e41001 /src/gallium/drivers/radeonsi | |
| parent | 87b88f1daec466e282bb92abbd5754674acb4e54 (diff) | |
radeonsi: require LLVM 3.4 for MSAA
Diffstat (limited to 'src/gallium/drivers/radeonsi')
| -rw-r--r-- | src/gallium/drivers/radeonsi/radeonsi_pipe.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_state.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c index 6424d032751..4211f981fee 100644 --- a/src/gallium/drivers/radeonsi/radeonsi_pipe.c +++ b/src/gallium/drivers/radeonsi/radeonsi_pipe.c @@ -371,8 +371,9 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param) case PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER: case PIPE_CAP_TGSI_INSTANCEID: case PIPE_CAP_COMPUTE: + case PIPE_CAP_TEXTURE_MULTISAMPLE: - return 1; + return HAVE_LLVM >= 0x0304 && rscreen->chip_class == SI; case PIPE_CAP_TGSI_TEXCOORD: return 0; diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index af67382dc96..06c349d4024 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -1689,7 +1689,7 @@ boolean si_is_format_supported(struct pipe_screen *screen, return FALSE; if (sample_count > 1) { - if (rscreen->chip_class >= CIK) + if (HAVE_LLVM < 0x0304 || rscreen->chip_class != SI) return FALSE; switch (sample_count) { |