i965: 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.

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

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 5321f876478ee6918f133f5c3967d33ae444a335..7adf07289d76c58ba429c58d26152d453c364508 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -94,6 +94,8 @@ brw_query_samples_for_format(struct gl_context *ctx, GLenum target,
    }
 }
 
+const char *const brw_vendor_string = "Intel Open Source Technology Center";
+
 static const GLubyte *
 intelGetString(struct gl_context * ctx, GLenum name)
 {
@@ -103,8 +105,7 @@ intelGetString(struct gl_context * ctx, GLenum name)
 
    switch (name) {
    case GL_VENDOR:
-      return (GLubyte *) "Intel Open Source Technology Center";
-      break;
+      return (GLubyte *) brw_vendor_string;
 
    case GL_RENDERER:
       switch (brw->intelScreen->deviceID) {

diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index 66c74f73cfa3580c11e6be11712871a9f92660be..6b15c483b4fdeb29d99fd620b981f0951abfbb4b 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -1461,6 +1461,8 @@ extern void intelInitClearFuncs(struct dd_function_table *functions);
 /*======================================================================
  * brw_context.c
  */
+extern const char *const brw_vendor_string;
+
 extern void intelFinish(struct gl_context * ctx);
 
 enum {