From d7c68e2dc1e08350ce5eb35bc0b20258a50f0dfb Mon Sep 17 00:00:00 2001 From: Michel Dänzer Date: Fri, 24 Jan 2014 17:51:34 +0900 Subject: radeonsi: Enable OpenGL 3.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_pipe.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/gallium') diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 0b6f19f5a4c..ff8788ea225 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -269,7 +269,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param) return 256; case PIPE_CAP_GLSL_FEATURE_LEVEL: - return 140; + return HAVE_LLVM >= 0x0305 ? 330 : 140; case PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT: return 1; @@ -307,7 +307,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param) case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS: return 16384; case PIPE_CAP_MAX_COMBINED_SAMPLERS: - return 32; + return HAVE_LLVM >= 0x0305 ? 48 : 32; /* Render targets. */ case PIPE_CAP_MAX_RENDER_TARGETS: @@ -340,8 +340,10 @@ static int si_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enu case PIPE_SHADER_VERTEX: break; case PIPE_SHADER_GEOMETRY: - /* TODO: support and enable geometry programs */ +#if HAVE_LLVM < 0x0305 return 0; +#endif + break; case PIPE_SHADER_COMPUTE: switch (param) { case PIPE_SHADER_CAP_PREFERRED_IR: -- cgit v1.2.3