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>
This commit is contained in:
Ian Romanick
2013-02-14 16:25:44 -08:00
parent 64bb1e857a
commit 135b7e7260
2 changed files with 4 additions and 2 deletions
+2 -2
View File
@@ -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) {
@@ -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,