summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2014-02-19 21:53:38 +0000
committerEmil Velikov <[email protected]>2014-08-15 17:35:37 +0100
commit55d1251d417ff564cc97e54b52a105edad36ccde (patch)
treefd12d48cc633e51295590b530b60d3ce0342d280 /src/mesa/drivers/dri
parent76f07362ea411fd6ef29b34df3885def5137bcba (diff)
dri/radeon: don't print TCL status on glGetString(GL_RENDERER)
Printing the TCL involves that context is available at the time of query. The GLX_MESA_query_renderer states that glGetString(GL_RENDERER) and glXQueryRendererStringMESA(GLX_RENDERER_DEVICE_ID_MESA) will have the same format, thus removing the context dependenicy will help us achieve that. Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/radeon/radeon_common_context.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c
index 54db9d549e1..353ecf5e243 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c
@@ -84,10 +84,9 @@ static const GLubyte *radeonGetString(struct gl_context * ctx, GLenum name)
case GL_RENDERER:
{
- unsigned offset;
+ char hardwarename[32];
GLuint agp_mode = (radeon->radeonScreen->card_type==RADEON_CARD_PCI) ? 0 :
radeon->radeonScreen->AGPMode;
- char hardwarename[32];
sprintf(hardwarename, "%s (%s %04X)",
#if defined(RADEON_R100)
@@ -98,11 +97,7 @@ static const GLubyte *radeonGetString(struct gl_context * ctx, GLenum name)
get_chip_family_name(radeon->radeonScreen->chip_family),
radeon->radeonScreen->device_id);
- offset = driGetRendererString(buffer, hardwarename, agp_mode);
-
- sprintf(&buffer[offset], " %sTCL",
- !(radeon->TclFallback & RADEON_TCL_FALLBACK_TCL_DISABLE)
- ? "" : "NO-");
+ driGetRendererString(buffer, hardwarename, agp_mode);
strcat(buffer, " DRI2");