diff options
| author | Vadim Girlin <[email protected]> | 2013-08-02 06:38:23 +0400 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2014-02-05 10:49:11 +1000 |
| commit | 1371d65a7fbd695d3516861fe733685569d890d0 (patch) | |
| tree | 8c387665f364abadb25a1a6817c7178ec4aff39d /src/gallium/drivers/r600/r600_pipe.c | |
| parent | 34ee1d0f9f64cd19ed0ddbbbf82db6230afca71d (diff) | |
r600g: initial support for geometry shaders on evergreen (v2)
This is Vadim's initial work with a few regression fixes squashed in.
v2: (airlied)
fix regression in glsl-max-varyings - need to use vs and ps_dirty
fix regression in shader exports from rebasing.
whitespace fixing.
v2.1: squash fix assert
Signed-off-by: Vadim Girlin <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 49521e0eb5a..6c80f85f9e3 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -447,15 +447,18 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param) static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enum pipe_shader_cap param) { + struct r600_screen *rscreen = (struct r600_screen *)pscreen; + switch(shader) { case PIPE_SHADER_FRAGMENT: case PIPE_SHADER_VERTEX: - case PIPE_SHADER_COMPUTE: + case PIPE_SHADER_COMPUTE: break; case PIPE_SHADER_GEOMETRY: - /* XXX: support and enable geometry programs */ - return 0; + if (rscreen->b.chip_class < EVERGREEN) + return 0; + break; default: /* XXX: support tessellation on Evergreen */ return 0; |