i915: Refactor the vendor string out of intelGetString

This will soon be used in intel_screen.c from a function that doesn't
have a gl_context.

v2: Remove spurious break after return.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index 15d40748bcbb2fdb610b81876d5bb2d82cd2b879..420ab2a0c47cb076dc9e1c63a7e48a574d3a3de7 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -60,6 +60,7 @@
 
 int INTEL_DEBUG = (0);
 
+const char *const i915_vendor_string = "Intel Open Source Technology Center";
 
 static const GLubyte *
 intelGetString(struct gl_context * ctx, GLenum name)
@@ -70,8 +71,7 @@ intelGetString(struct gl_context * ctx, GLenum name)
 
    switch (name) {
    case GL_VENDOR:
-      return (GLubyte *) "Intel Open Source Technology Center";
-      break;
+      return (GLubyte *) i915_vendor_string;
 
    case GL_RENDERER:
       switch (intel->intelScreen->deviceID) {

diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
index 0b83a3ef656a8c62958fdbc9e3cc79d593ec99d4..e386e46782e3ef4139db7e08fc5ccc17330472cc 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_context.h
+++ b/src/mesa/drivers/dri/i915/intel_context.h
@@ -393,6 +393,8 @@ extern int INTEL_DEBUG;
  * intel_context.c:
  */
 
+extern const char *const i915_vendor_string;
+
 extern bool intelInitContext(struct intel_context *intel,
                              int api,
                              unsigned major_version,