Merge branch 'mesa_7_5_branch'

Conflicts:

	Makefile
	configs/default
	docs/relnotes.html
	src/mesa/main/version.h
This commit is contained in:
Brian Paul
2009-07-28 08:58:25 -06:00
13 changed files with 148 additions and 26 deletions

View File

@@ -628,10 +628,10 @@ intel_init_bufmgr(intelScreenPrivate *intelScreen)
/* Otherwise, use the classic buffer manager. */
if (intelScreen->bufmgr == NULL) {
if (gem_disable) {
fprintf(stderr, "GEM disabled. Using classic.\n");
_mesa_warning(NULL, "GEM disabled. Using classic.");
} else {
fprintf(stderr, "Failed to initialize GEM. "
"Falling back to classic.\n");
_mesa_warning(NULL,
"Failed to initialize GEM. Falling back to classic.");
}
if (intelScreen->tex.size == 0) {