diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2013-10-11 12:16:39 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-10-14 10:42:01 -0700 |
| commit | 31bdd56bd94cc35ac813f15b4d6f021d3cff23f2 (patch) | |
| tree | 938e81596f90232551c9a969bed35ea83b597b53 | |
| parent | 79f8bd1c82bd8d319f0f67d0c13f4e08ecdd64d4 (diff) | |
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>
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 5 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index ec3a750e87f..9b79745b9ac 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -95,6 +95,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) { @@ -104,8 +106,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 5725ef6e547..d233a09de8b 100644 --- a/src/mesa/drivers/dri/i965/brw_context.h +++ b/src/mesa/drivers/dri/i965/brw_context.h @@ -1472,6 +1472,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 { |