projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a677952)
r600g: set correct PIPE_CAP_MAX_COMBINED_SAMPLERS
authorMarek Olšák <maraeo@gmail.com>
Tue, 3 May 2011 09:54:07 +0000 (11:54 +0200)
committerMarek Olšák <maraeo@gmail.com>
Tue, 3 May 2011 10:03:22 +0000 (12:03 +0200)
src/gallium/drivers/r600/r600_pipe.c patch | blob | history

diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index e28d834dfeea72cd61b849140f634c190ae340ed..9a5f172369ddd708c75b2af51ae51bdac26c57ee 100644 (file)
--- 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: