From 92b4ca45504e7ffc5f4fa385ada1be48e6123181 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 7 Jun 2017 22:00:48 +0200 Subject: [PATCH] st/mesa: remove the "Gallium 0.4 on" prefix from GL_RENDERER If you want to keep it for your driver, please raise your hand. The prefix will probably have to be added into the driver instead of here. I cringe when I look at my long renderer string: Gallium 0.4 on AMD Radeon R9 Fury Series (DRM 3.17.0 / 4.11.0-staging-01277-gab25a9e, LLVM 5.0.0) I'm sincerely sorry for all apps that detect Mesa by expecting "Gallium" in the string. Reviewed-by: Eric Anholt --- src/mesa/state_tracker/st_cb_strings.c | 8 +------- src/mesa/state_tracker/st_context.h | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_strings.c b/src/mesa/state_tracker/st_cb_strings.c index fc48fd0..99d93a7 100644 --- a/src/mesa/state_tracker/st_cb_strings.c +++ b/src/mesa/state_tracker/st_cb_strings.c @@ -39,8 +39,6 @@ #include "st_context.h" #include "st_cb_strings.h" -#define ST_VERSION_STRING "0.4" - static const GLubyte * st_get_string(struct gl_context * ctx, GLenum name) { @@ -55,11 +53,7 @@ st_get_string(struct gl_context * ctx, GLenum name) } case GL_RENDERER: - util_snprintf(st->renderer, sizeof(st->renderer), "Gallium %s on %s", - ST_VERSION_STRING, - screen->get_name( screen )); - - return (GLubyte *) st->renderer; + return (GLubyte *) screen->get_name(screen); default: return NULL; diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index f8e9bf9..7d04e89 100644 --- a/src/mesa/state_tracker/st_context.h +++ b/src/mesa/state_tracker/st_context.h @@ -164,7 +164,6 @@ struct st_context } state; char vendor[100]; - char renderer[100]; uint64_t dirty; /**< dirty states */ -- 2.7.4