diff options
| author | Marek Olšák <[email protected]> | 2012-01-24 22:23:01 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-01-29 02:16:00 +0100 |
| commit | 171be755223d99f8cc5cc1bdaf8bd7b4caa04b4f (patch) | |
| tree | 4fa7b708b29027241eda8262dfa0c0e50fc8b2b4 /src/gallium/drivers | |
| parent | 1d01429c6a1ae679d0cc0cb61db1948fca5ced4c (diff) | |
st/mesa: add PIPE_CAP_GLSL_FEATURE_LEVEL, cleanup st_extensions.c
v2: handle the cap in r300 and r600 as well
Additional info for r600g:
The env var R600_GLSL130=1 enables GLSL 1.3.
Along with R600_STREAMOUT=1, it enables full GL 3.
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/r300/r300_screen.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_screen.c | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c index 48a65696359..9a9418bc927 100644 --- a/src/gallium/drivers/r300/r300_screen.c +++ b/src/gallium/drivers/r300/r300_screen.c @@ -105,6 +105,9 @@ static int r300_get_param(struct pipe_screen* pscreen, enum pipe_cap param) case PIPE_CAP_VERTEX_COLOR_CLAMPED: return 1; + case PIPE_CAP_GLSL_FEATURE_LEVEL: + return 120; + /* r300 cannot do swizzling of compressed textures. Supported otherwise. */ case PIPE_CAP_TEXTURE_SWIZZLE: return util_format_s3tc_enabled ? r300screen->caps.dxtc_swizzle : 1; diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index c38fbc59c5a..1123557a5ec 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -367,6 +367,9 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param) case PIPE_CAP_VERTEX_COLOR_UNCLAMPED: return 1; + case PIPE_CAP_GLSL_FEATURE_LEVEL: + return debug_get_bool_option("R600_GLSL130", FALSE) ? 130 : 120; + /* Supported except the original R600. */ case PIPE_CAP_INDEP_BLEND_ENABLE: case PIPE_CAP_INDEP_BLEND_FUNC: diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c index 37bbc43f325..6cafeafbe19 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -132,6 +132,8 @@ softpipe_get_param(struct pipe_screen *screen, enum pipe_cap param) case PIPE_CAP_VERTEX_COLOR_UNCLAMPED: /* draw module */ case PIPE_CAP_VERTEX_COLOR_CLAMPED: /* draw module */ return 1; + case PIPE_CAP_GLSL_FEATURE_LEVEL: + return 130; default: return 0; } |