radeonsi: require LLVM 3.4 for MSAA

diff --git a/src/gallium/drivers/radeonsi/radeonsi_pipe.c b/src/gallium/drivers/radeonsi/radeonsi_pipe.c
index 6424d032751edee2ebfdf9422e341775b1aafcc0..4211f981fee93c54f90c6b723640090722b3893e 100644 (file)
--- 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 af67382dc9623533e87fc41a074e74233ecd9ca6..06c349d4024e472832965ab4976056fc6b06ebc7 100644 (file)
--- 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) {