summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_screen.c
diff options
context:
space:
mode:
authorBryan Cain <bryancain3@gmail.com>2011-08-04 15:43:34 -0500
committerBryan Cain <bryancain3@gmail.com>2011-08-04 15:43:34 -0500
commit4683529048ee133481b2d8f1cae1685aa1736f9a (patch)
treee02d90f4164e4dc6259000c358d65e6af84a3a31 /src/gallium/drivers/r300/r300_screen.c
parent50073563b2bfe3716b3dc8b1ed2f91381ba24305 (diff)
parent9adcab9cd464d659288e31e6767efb5dee3894ff (diff)
downloadexternal_mesa3d-4683529048ee133481b2d8f1cae1685aa1736f9a.zip
external_mesa3d-4683529048ee133481b2d8f1cae1685aa1736f9a.tar.gz
external_mesa3d-4683529048ee133481b2d8f1cae1685aa1736f9a.tar.bz2
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/r300/r300_screen.c')
-rw-r--r--src/gallium/drivers/r300/r300_screen.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index d937830..47de400 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -258,6 +258,8 @@ static int r300_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:
break;
}