Mesa (master): i915: Refactor the renderer string creation out of intelGetString
Ian Romanick
idr at kemper.freedesktop.org
Fri Nov 8 02:24:13 UTC 2013
Module: Mesa
Branch: master
Commit: 339f36fc5e841d751e81127da39e5679a88c738f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=339f36fc5e841d751e81127da39e5679a88c738f
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Thu Feb 14 16:27:01 2013 -0800
i915: Refactor the renderer string creation 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/i915/intel_context.c | 34 +++++++++++++++++-----------
src/mesa/drivers/dri/i915/intel_context.h | 2 +
2 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/src/mesa/drivers/dri/i915/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c
index 420ab2a..baa8b6e 100644
--- a/src/mesa/drivers/dri/i915/intel_context.c
+++ b/src/mesa/drivers/dri/i915/intel_context.c
@@ -62,29 +62,37 @@ int INTEL_DEBUG = (0);
const char *const i915_vendor_string = "Intel Open Source Technology Center";
+const char *
+i915_get_renderer_string(unsigned deviceID)
+{
+ const char *chipset;
+ static char buffer[128];
+
+ switch (deviceID) {
+#undef CHIPSET
+#define CHIPSET(id, symbol, str) case id: chipset = str; break;
+#include "pci_ids/i915_pci_ids.h"
+ default:
+ chipset = "Unknown Intel Chipset";
+ break;
+ }
+
+ (void) driGetRendererString(buffer, chipset, 0);
+ return buffer;
+}
+
static const GLubyte *
intelGetString(struct gl_context * ctx, GLenum name)
{
const struct intel_context *const intel = intel_context(ctx);
- const char *chipset;
- static char buffer[128];
switch (name) {
case GL_VENDOR:
return (GLubyte *) i915_vendor_string;
case GL_RENDERER:
- switch (intel->intelScreen->deviceID) {
-#undef CHIPSET
-#define CHIPSET(id, symbol, str) case id: chipset = str; break;
-#include "pci_ids/i915_pci_ids.h"
- default:
- chipset = "Unknown Intel Chipset";
- break;
- }
-
- (void) driGetRendererString(buffer, chipset, 0);
- return (GLubyte *) buffer;
+ return
+ (GLubyte *) i915_get_renderer_string(intel->intelScreen->deviceID);
default:
return NULL;
diff --git a/src/mesa/drivers/dri/i915/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h
index e386e46..e488ed1 100644
--- a/src/mesa/drivers/dri/i915/intel_context.h
+++ b/src/mesa/drivers/dri/i915/intel_context.h
@@ -395,6 +395,8 @@ extern int INTEL_DEBUG;
extern const char *const i915_vendor_string;
+extern const char *i915_get_renderer_string(unsigned deviceID);
+
extern bool intelInitContext(struct intel_context *intel,
int api,
unsigned major_version,
More information about the mesa-commit
mailing list