Mesa (master): i915: Refactor the vendor string out of intelGetString
Ian Romanick
idr at kemper.freedesktop.org
Fri Nov 8 02:24:13 UTC 2013
Module: Mesa
Branch: master
Commit: 135b7e72601ab0c3923cafedcd30bb505e54f624
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=135b7e72601ab0c3923cafedcd30bb505e54f624
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Thu Feb 14 16:25:44 2013 -0800
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 at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/i915/intel_context.c | 4 ++--
src/mesa/drivers/dri/i915/intel_context.h | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index 15d4074..420ab2a 100644
--- 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 0b83a3e..e386e46 100644
--- 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,
More information about the mesa-commit
mailing list