mesa: Branch 'master'

[Dave Airlie]

 src/mesa/drivers/dri/r300/radeon_context.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

New commits:
diff-tree 6a9b0cd0b43ba01b24871ec1fa155e192ddeaa56 (from e5070bc3ca75dee31034cc543f3d2ee04e5dc032)
Author: Dave Airlie <airlied at linux.ie>
Date:   Sat Mar 17 16:46:24 2007 +1100

    r300: change vendor string to DRI R300 Project

diff --git a/src/mesa/drivers/dri/r300/radeon_context.c b/src/mesa/drivers/dri/r300/radeon_context.c
index 66d1b15..22f943e 100644
--- a/src/mesa/drivers/dri/r300/radeon_context.c
+++ b/src/mesa/drivers/dri/r300/radeon_context.c
@@ -70,7 +70,10 @@ static const GLubyte *radeonGetString(GL
 
 	switch (name) {
 	case GL_VENDOR:
-		return (GLubyte *) "Tungsten Graphics, Inc.";
+		if (IS_R300_CLASS(radeon->radeonScreen))
+			return (GLubyte *) "DRI R300 Project";
+		else
+			return (GLubyte *) "Tungsten Graphics, Inc.";
 
 	case GL_RENDERER:
 	{