diff options
| author | Marek Olšák <[email protected]> | 2014-07-08 02:50:57 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2014-07-18 01:58:58 +0200 |
| commit | a66d9341393b9a82aa197e8bab942c6de1ecf02e (patch) | |
| tree | 300deb968e43db154d0ae0bd66b373cd3a4bd3e1 /src/gallium/drivers/radeonsi/si_pipe.c | |
| parent | 4ad682461e188eab570a206921b3c2b4bbeb6ece (diff) | |
radeonsi: assume LLVM 3.4.2 is always present
Reviewed-by: Michel Dänzer <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_pipe.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 607d0690bac..cef6e5073e2 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -218,8 +218,8 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param) case PIPE_CAP_TEXTURE_MULTISAMPLE: /* 2D tiling on CIK is supported since DRM 2.35.0 */ - return HAVE_LLVM >= 0x0304 && (sscreen->b.chip_class < CIK || - sscreen->b.info.drm_minor >= 35); + return sscreen->b.chip_class < CIK || + sscreen->b.info.drm_minor >= 35; case PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT: return R600_MAP_BUFFER_ALIGNMENT; @@ -229,7 +229,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param) return 4; case PIPE_CAP_GLSL_FEATURE_LEVEL: - return (LLVM_SUPPORTS_GEOM_SHADERS) ? 330 : 140; + return 330; case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE: return MIN2(sscreen->b.info.vram_size, 0xFFFFFFFF); @@ -317,11 +317,7 @@ static int si_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enu { case PIPE_SHADER_FRAGMENT: case PIPE_SHADER_VERTEX: - break; case PIPE_SHADER_GEOMETRY: -#if !(LLVM_SUPPORTS_GEOM_SHADERS) - return 0; -#endif break; case PIPE_SHADER_COMPUTE: switch (param) { @@ -421,7 +417,7 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws) } sscreen->b.has_cp_dma = true; - sscreen->b.has_streamout = HAVE_LLVM >= 0x0304; + sscreen->b.has_streamout = true; if (debug_get_bool_option("RADEON_DUMP_SHADERS", FALSE)) sscreen->b.debug_flags |= DBG_FS | DBG_VS | DBG_GS | DBG_PS | DBG_CS; |