From: Ian Romanick <ian.d.roman...@intel.com> 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.roman...@intel.com> --- 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 de3488b..ae1ed0c 100644 --- a/src/mesa/drivers/dri/i915/intel_context.c +++ b/src/mesa/drivers/dri/i915/intel_context.c @@ -64,12 +64,29 @@ 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: @@ -77,17 +94,8 @@ intelGetString(struct gl_context * ctx, GLenum name) break; 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 6b04c49..a471f99 100644 --- a/src/mesa/drivers/dri/i915/intel_context.h +++ b/src/mesa/drivers/dri/i915/intel_context.h @@ -423,6 +423,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, -- 1.8.1.4 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev