diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-14 14:47:07 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-14 14:47:07 +0200 |
| commit | e066f54c99aecce620158fe7f31589242df55677 (patch) | |
| tree | f914574daeee09dafd33fa910d9c05cb2bdc7a3d /mesalib/src/mesa/state_tracker | |
| parent | 49659ef96348cc1bb20813abf7578acdb3cfe3d1 (diff) | |
| download | vcxsrv-e066f54c99aecce620158fe7f31589242df55677.tar.gz vcxsrv-e066f54c99aecce620158fe7f31589242df55677.tar.bz2 vcxsrv-e066f54c99aecce620158fe7f31589242df55677.zip | |
mesa git update 14 sep 2011
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_extensions.c | 4 | ||||
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_texture.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c index 0ad9e1286..722db8d77 100644 --- a/mesalib/src/mesa/state_tracker/st_extensions.c +++ b/mesalib/src/mesa/state_tracker/st_extensions.c @@ -176,8 +176,8 @@ void st_init_limits(struct st_context *st) /* Gallium doesn't really care about local vs. env parameters so use the * same limits. */ - pc->MaxLocalParams = pc->MaxParameters; - pc->MaxEnvParams = pc->MaxParameters; + pc->MaxLocalParams = MIN2(pc->MaxParameters, MAX_PROGRAM_LOCAL_PARAMS); + pc->MaxEnvParams = MIN2(pc->MaxParameters, MAX_PROGRAM_ENV_PARAMS); options->EmitNoNoise = TRUE; diff --git a/mesalib/src/mesa/state_tracker/st_texture.c b/mesalib/src/mesa/state_tracker/st_texture.c index 232c286c1..c5dc7dcc4 100644 --- a/mesalib/src/mesa/state_tracker/st_texture.c +++ b/mesalib/src/mesa/state_tracker/st_texture.c @@ -72,9 +72,8 @@ st_texture_create(struct st_context *st, if (target == PIPE_TEXTURE_CUBE) assert(layers == 6); - DBG("%s target %s format %s last_level %d\n", __FUNCTION__, - _mesa_lookup_enum_by_nr(target), - _mesa_lookup_enum_by_nr(format), last_level); + DBG("%s target %d format %s last_level %d\n", __FUNCTION__, + (int) target, util_format_name(format), last_level); assert(format); assert(screen->is_format_supported(screen, format, target, 0, |