From: Marek Olšák <marek.olsak@amd.com>
Date: Wed, 7 Jun 2017 20:00:48 +0000 (+0200)
Subject: st/mesa: remove the "Gallium 0.4 on" prefix from GL_RENDERER
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92b4ca45504e7ffc5f4fa385ada1be48e6123181;p=mesa.git

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 <eric@anholt.net>
---

diff --git a/src/mesa/state_tracker/st_cb_strings.c b/src/mesa/state_tracker/st_cb_strings.c
index fc48fd05e3e..99d93a7c8f5 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 f8e9bf96c52..7d04e892a8b 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 */