From 66b6babbeab510b17cbb325dab3cd7cfbe1f9674 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Wed, 7 Jun 2017 22:04:34 +0200 Subject: [PATCH] st/mesa: simplify returning GL_VENDOR MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- src/mesa/state_tracker/st_cb_strings.c | 4 +--- src/mesa/state_tracker/st_context.h | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_strings.c b/src/mesa/state_tracker/st_cb_strings.c index 99d93a7c8f5..85fe5a7ef61 100644 --- a/src/mesa/state_tracker/st_cb_strings.c +++ b/src/mesa/state_tracker/st_cb_strings.c @@ -47,9 +47,7 @@ st_get_string(struct gl_context * ctx, GLenum name) switch (name) { case GL_VENDOR: { - const char *vendor = screen->get_vendor( screen ); - util_snprintf(st->vendor, sizeof(st->vendor), "%s", vendor); - return (GLubyte *) st->vendor; + return (GLubyte *) screen->get_vendor(screen); } case GL_RENDERER: diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h index 7d04e892a8b..f640e23dcc1 100644 --- a/src/mesa/state_tracker/st_context.h +++ b/src/mesa/state_tracker/st_context.h @@ -163,8 +163,6 @@ struct st_context GLuint fb_orientation; } state; - char vendor[100]; - uint64_t dirty; /**< dirty states */ /** This masks out unused shader resources. Only valid in draw calls. */ -- 2.30.2