diff options
| author | Bryan Cain <[email protected]> | 2011-08-04 15:43:34 -0500 |
|---|---|---|
| committer | Bryan Cain <[email protected]> | 2011-08-04 15:43:34 -0500 |
| commit | 4683529048ee133481b2d8f1cae1685aa1736f9a (patch) | |
| tree | e02d90f4164e4dc6259000c358d65e6af84a3a31 /src/gallium/drivers/r600 | |
| parent | 50073563b2bfe3716b3dc8b1ed2f91381ba24305 (diff) | |
| parent | 9adcab9cd464d659288e31e6767efb5dee3894ff (diff) | |
Merge branch 'glsl-to-tgsi'
Conflicts:
src/mesa/state_tracker/st_atom_pixeltransfer.c
src/mesa/state_tracker/st_program.c
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index 5159ba350e4..461f59439e8 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -468,6 +468,8 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e return 1; case PIPE_SHADER_CAP_SUBROUTINES: return 0; + case PIPE_SHADER_CAP_INTEGERS: + return 0; default: return 0; } |