Mesa (master): i965: 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: 18291251ec3e17967b9df89815c9d2dc92bf41dc
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=18291251ec3e17967b9df89815c9d2dc92bf41dc
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Fri Oct 11 12:16:39 2013 -0700
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 at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/i965/brw_context.c | 5 +++--
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 5321f87..7adf072 100644
--- 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 66c74f7..6b15c48 100644
--- 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 {
More information about the mesa-commit
mailing list