diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-12 08:58:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-12 08:58:44 +0200 |
| commit | 24a692ce832161d3b794110dd82b1508d38a0887 (patch) | |
| tree | 388d2fd8dc707763d6ffea7edfa2a6a1410c7c5e /mesalib/src/mesa/state_tracker/st_extensions.c | |
| parent | f9cf11136d65f20aab4fb6d5fc3ec3c59185a0b4 (diff) | |
| download | vcxsrv-24a692ce832161d3b794110dd82b1508d38a0887.tar.gz vcxsrv-24a692ce832161d3b794110dd82b1508d38a0887.tar.bz2 vcxsrv-24a692ce832161d3b794110dd82b1508d38a0887.zip | |
git update 12 sep 2011
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_extensions.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_extensions.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c index a41e9e872..0ad9e1286 100644 --- a/mesalib/src/mesa/state_tracker/st_extensions.c +++ b/mesalib/src/mesa/state_tracker/st_extensions.c @@ -85,6 +85,9 @@ void st_init_limits(struct st_context *st) c->MaxTextureRectSize = _min(1 << (c->MaxTextureLevels - 1), MAX_TEXTURE_RECT_SIZE); + c->MaxArrayTextureLayers + = screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS); + c->MaxTextureImageUnits = _min(screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS), MAX_TEXTURE_IMAGE_UNITS); @@ -170,6 +173,12 @@ void st_init_limits(struct st_context *st) /* raise MaxParameters if native support is higher */ pc->MaxParameters = MAX2(pc->MaxParameters, pc->MaxNativeParameters); + /* Gallium doesn't really care about local vs. env parameters so use the + * same limits. + */ + pc->MaxLocalParams = pc->MaxParameters; + pc->MaxEnvParams = pc->MaxParameters; + options->EmitNoNoise = TRUE; /* TODO: make these more fine-grained if anyone needs it */ @@ -499,7 +508,7 @@ void st_init_extensions(struct st_context *st) } /* GL_EXT_texture_array */ - if (screen->get_param(screen, PIPE_CAP_ARRAY_TEXTURES)) { + if (screen->get_param(screen, PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS) > 1) { ctx->Extensions.EXT_texture_array = GL_TRUE; ctx->Extensions.MESA_texture_array = GL_TRUE; } |