From 21d9a1b5ef51ce449e9a82641d0d605c5448b41c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 16 Aug 2013 15:21:45 +0200 Subject: [PATCH] radeonsi: require LLVM 3.4 for MSAA --- src/gallium/drivers/radeonsi/radeonsi_pipe.c | 3 ++- 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) { -- 2.30.2