Mesa (master): st/mesa: simplify returning GL_VENDOR

Marek Olšák mareko at kemper.freedesktop.org
Mon Jun 19 18:14:26 UTC 2017


Module: Mesa
Branch: master
Commit: 66b6babbeab510b17cbb325dab3cd7cfbe1f9674
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=66b6babbeab510b17cbb325dab3cd7cfbe1f9674

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Jun  7 22:04:34 2017 +0200

st/mesa: simplify returning GL_VENDOR

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 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 99d93a7c8f..85fe5a7ef6 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 7d04e892a8..f640e23dcc 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. */




More information about the mesa-commit mailing list