diff options
| author | Marek Olšák <[email protected]> | 2011-05-03 11:54:07 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2011-05-03 12:03:22 +0200 |
| commit | 320adb93a137a733da4b44f41e2d8ba01f164568 (patch) | |
| tree | 2fdc9e3ceb313ec7ceefad2c25ffdf79dc5d9cd3 /src/gallium/drivers/r600/r600_pipe.c | |
| parent | a677952e681642c286ae6c5544a5b8ba3dfe8ec8 (diff) | |
r600g: set correct PIPE_CAP_MAX_COMBINED_SAMPLERS
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index e28d834dfee..9a5f172369d 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -404,11 +404,10 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param) else return 14; case PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS: - /* FIXME allow this once infrastructure is there */ - return 16; case PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS: - case PIPE_CAP_MAX_COMBINED_SAMPLERS: return 16; + case PIPE_CAP_MAX_COMBINED_SAMPLERS: + return 32; /* Render targets. */ case PIPE_CAP_MAX_RENDER_TARGETS: |