If swrast is being used there's nothing “Accelerated” about it
Signed-off-by: Christopher James Halse Rogers
<christopher.halse.rog...@canonical.com>
---
glx/glxdri.c | 36 ++++++++++++++++++------------------
glx/glxdri2.c | 22 +++++++++++-----------
glx/glxdricommon.c | 6 +++---
glx/glxdriswrast.c | 4 ++--
4 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/glx/glxdri.c b/glx/glxdri.c
index 3a57337..84a1c4a 100644
--- a/glx/glxdri.c
+++ b/glx/glxdri.c
@@ -866,7 +866,7 @@ glxDRIEnterVT (int index, int flags)
__GLXDRIscreen *screen = (__GLXDRIscreen *)
glxGetScreen(screenInfo.screens[index]);
- LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
+ LogMessage(X_INFO, "GLX: Resuming GLX clients after VT switch\n");
scrn->EnterVT = screen->enterVT;
@@ -890,7 +890,7 @@ glxDRILeaveVT (int index, int flags)
__GLXDRIscreen *screen = (__GLXDRIscreen *)
glxGetScreen(screenInfo.screens[index]);
- LogMessage(X_INFO, "AIGLX: Suspending AIGLX clients for VT switch\n");
+ LogMessage(X_INFO, "GLX: Suspending GLX clients for VT switch\n");
glxSuspendClients();
@@ -914,7 +914,7 @@ initializeExtensions(__GLXDRIscreen *screen)
__glXEnableExtension(screen->glx_enable_bits,
"GLX_SGI_make_current_read");
- LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_make_current_read\n");
+ LogMessage(X_INFO, "GLX: enabled GLX_SGI_make_current_read\n");
}
#endif
@@ -924,7 +924,7 @@ initializeExtensions(__GLXDRIscreen *screen)
__glXEnableExtension(screen->glx_enable_bits,
"GLX_MESA_copy_sub_buffer");
- LogMessage(X_INFO, "AIGLX: enabled GLX_MESA_copy_sub_buffer\n");
+ LogMessage(X_INFO, "GLX: enabled GLX_MESA_copy_sub_buffer\n");
}
#endif
@@ -936,14 +936,14 @@ initializeExtensions(__GLXDRIscreen *screen)
__glXEnableExtension(screen->glx_enable_bits,
"GLX_MESA_swap_control");
- LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_swap_control and
GLX_MESA_swap_control\n");
+ LogMessage(X_INFO, "GLX: enabled GLX_SGI_swap_control and
GLX_MESA_swap_control\n");
}
#endif
#ifdef __DRI_TEX_OFFSET
if (strcmp(extensions[i]->name, __DRI_TEX_OFFSET) == 0) {
screen->texOffset = (__DRItexOffsetExtension *) extensions[i];
- LogMessage(X_INFO, "AIGLX: enabled GLX_texture_from_pixmap with
driver support\n");
+ LogMessage(X_INFO, "GLX: enabled GLX_texture_from_pixmap with
driver support\n");
}
#endif
/* Ignore unknown extensions */
@@ -978,7 +978,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
!DRIQueryDirectRenderingCapable(pScreen, &isCapable) ||
!isCapable) {
LogMessage(X_INFO,
- "AIGLX: Screen %d is not DRI capable\n", pScreen->myNum);
+ "GLX: Screen %d is not DRI capable\n", pScreen->myNum);
return NULL;
}
@@ -1000,20 +1000,20 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
dri_version.patch = XF86DRI_PATCH_VERSION;
if (!DRIOpenConnection(pScreen, &hSAREA, &BusID)) {
- LogMessage(X_ERROR, "AIGLX error: DRIOpenConnection failed\n");
+ LogMessage(X_ERROR, "GLX error: DRIOpenConnection failed\n");
goto handle_error;
}
fd = drmOpenOnce(NULL, BusID, &newlyopened);
if (fd < 0) {
- LogMessage(X_ERROR, "AIGLX error: drmOpenOnce failed (%s)\n",
+ LogMessage(X_ERROR, "GLX error: drmOpenOnce failed (%s)\n",
strerror(-fd));
goto handle_error;
}
if (drmGetMagic(fd, &magic)) {
- LogMessage(X_ERROR, "AIGLX error: drmGetMagic failed\n");
+ LogMessage(X_ERROR, "GLX error: drmGetMagic failed\n");
goto handle_error;
}
@@ -1031,7 +1031,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
}
if (newlyopened && !DRIAuthConnection(pScreen, magic)) {
- LogMessage(X_ERROR, "AIGLX error: DRIAuthConnection failed\n");
+ LogMessage(X_ERROR, "GLX error: DRIAuthConnection failed\n");
goto handle_error;
}
@@ -1043,7 +1043,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
&ddx_version.minor,
&ddx_version.patch,
&driverName)) {
- LogMessage(X_ERROR, "AIGLX error: DRIGetClientDriverName failed\n");
+ LogMessage(X_ERROR, "GLX error: DRIGetClientDriverName failed\n");
goto handle_error;
}
@@ -1065,7 +1065,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
if (!DRIGetDeviceInfo(pScreen, &hFB, &junk,
&framebuffer.size, &framebuffer.stride,
&framebuffer.dev_priv_size, &framebuffer.dev_priv)) {
- LogMessage(X_ERROR, "AIGLX error: XF86DRIGetDeviceInfo failed\n");
+ LogMessage(X_ERROR, "GLX error: XF86DRIGetDeviceInfo failed\n");
goto handle_error;
}
@@ -1076,7 +1076,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
status = drmMap(fd, hFB, framebuffer.size,
(drmAddressPtr)&framebuffer.base);
if (status != 0) {
- LogMessage(X_ERROR, "AIGLX error: drmMap of framebuffer failed (%s)\n",
+ LogMessage(X_ERROR, "GLX error: drmMap of framebuffer failed (%s)\n",
strerror(-status));
goto handle_error;
}
@@ -1086,7 +1086,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
*/
status = drmMap(fd, hSAREA, SAREA_MAX, &pSAREA);
if (status != 0) {
- LogMessage(X_ERROR, "AIGLX error: drmMap of SAREA failed (%s)\n",
+ LogMessage(X_ERROR, "GLX error: drmMap of SAREA failed (%s)\n",
strerror(-status));
goto handle_error;
}
@@ -1105,7 +1105,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
if (screen->driScreen == NULL) {
LogMessage(X_ERROR,
- "AIGLX error: Calling driver entry point failed\n");
+ "GLX error: Calling driver entry point failed\n");
goto handle_error;
}
@@ -1140,7 +1140,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
pScrn->LeaveVT = glxDRILeaveVT;
LogMessage(X_INFO,
- "AIGLX: Loaded and initialized %s\n", driverName);
+ "GLX: Loaded and initialized %s\n", driverName);
return &screen->base;
@@ -1161,7 +1161,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
free(screen);
- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
+ LogMessage(X_ERROR, "GLX: reverting to software rendering\n");
return NULL;
}
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 18927d7..dc72977 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -607,7 +607,7 @@ glxDRIEnterVT (int index, int flags)
__GLXDRIscreen *screen = (__GLXDRIscreen *)
glxGetScreen(screenInfo.screens[index]);
- LogMessage(X_INFO, "AIGLX: Resuming AIGLX clients after VT switch\n");
+ LogMessage(X_INFO, "GLX: Resuming GLX clients after VT switch\n");
scrn->EnterVT = screen->enterVT;
@@ -631,7 +631,7 @@ glxDRILeaveVT (int index, int flags)
__GLXDRIscreen *screen = (__GLXDRIscreen *)
glxGetScreen(screenInfo.screens[index]);
- LogMessage(X_INFO, "AIGLX: Suspending AIGLX clients for VT switch\n");
+ LogMessage(X_INFO, "GLX: Suspending GLX clients for VT switch\n");
glxSuspendClients();
@@ -652,17 +652,17 @@ initializeExtensions(__GLXDRIscreen *screen)
__glXEnableExtension(screen->glx_enable_bits,
"GLX_MESA_copy_sub_buffer");
- LogMessage(X_INFO, "AIGLX: enabled GLX_MESA_copy_sub_buffer\n");
+ LogMessage(X_INFO, "GLX: enabled GLX_MESA_copy_sub_buffer\n");
__glXEnableExtension(screen->glx_enable_bits, "GLX_INTEL_swap_event");
- LogMessage(X_INFO, "AIGLX: enabled GLX_INTEL_swap_event\n");
+ LogMessage(X_INFO, "GLX: enabled GLX_INTEL_swap_event\n");
if (DRI2HasSwapControl(pScreen)) {
__glXEnableExtension(screen->glx_enable_bits,
"GLX_SGI_swap_control");
__glXEnableExtension(screen->glx_enable_bits,
"GLX_MESA_swap_control");
- LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_swap_control and
GLX_MESA_swap_control\n");
+ LogMessage(X_INFO, "GLX: enabled GLX_SGI_swap_control and
GLX_MESA_swap_control\n");
}
for (i = 0; extensions[i]; i++) {
@@ -671,7 +671,7 @@ initializeExtensions(__GLXDRIscreen *screen)
__glXEnableExtension(screen->glx_enable_bits,
"GLX_SGI_make_current_read");
- LogMessage(X_INFO, "AIGLX: enabled GLX_SGI_make_current_read\n");
+ LogMessage(X_INFO, "GLX: enabled GLX_SGI_make_current_read\n");
}
#endif
@@ -680,7 +680,7 @@ initializeExtensions(__GLXDRIscreen *screen)
screen->texBuffer =
(const __DRItexBufferExtension *) extensions[i];
/* GLX_EXT_texture_from_pixmap is always enabled. */
- LogMessage(X_INFO, "AIGLX: GLX_EXT_texture_from_pixmap backed by
buffer objects\n");
+ LogMessage(X_INFO, "GLX: GLX_EXT_texture_from_pixmap backed by
buffer objects\n");
}
#endif
@@ -712,7 +712,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
!DRI2Connect(pScreen, DRI2DriverDRI,
&screen->fd, &driverName, &deviceName)) {
LogMessage(X_INFO,
- "AIGLX: Screen %d is not DRI2 capable\n", pScreen->myNum);
+ "GLX: Screen %d is not DRI2 capable\n", pScreen->myNum);
return NULL;
}
@@ -739,7 +739,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
if (screen->driScreen == NULL) {
LogMessage(X_ERROR,
- "AIGLX error: Calling driver entry point failed\n");
+ "GLX error: Calling driver entry point failed\n");
goto handle_error;
}
@@ -783,7 +783,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
pScrn->LeaveVT = glxDRILeaveVT;
LogMessage(X_INFO,
- "AIGLX: Loaded and initialized %s\n", driverName);
+ "GLX: Loaded and initialized %s\n", driverName);
return &screen->base;
@@ -793,7 +793,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
free(screen);
- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n");
+ LogMessage(X_ERROR, "GLX: reverting to software rendering\n");
return NULL;
}
diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
index 0b250e1..7ef4985 100644
--- a/glx/glxdricommon.c
+++ b/glx/glxdricommon.c
@@ -231,14 +231,14 @@ glxProbeDriver(const char *driverName,
driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
if (driver == NULL) {
- LogMessage(X_INFO, "AIGLX: dlopen of %s failed (%s)\n",
+ LogMessage(X_INFO, "GLX: dlopen of %s failed (%s)\n",
filename, dlerror());
continue;
}
extensions = dlsym(driver, __DRI_DRIVER_EXTENSIONS);
if (extensions == NULL) {
- LogMessage(X_INFO, "AIGLX: %s exports no extensions (%s)\n",
+ LogMessage(X_INFO, "GLX: %s exports no extensions (%s)\n",
driverName, dlerror());
dlclose(driver);
continue;
@@ -258,7 +258,7 @@ glxProbeDriver(const char *driverName,
if (*coreExt == NULL || *renderExt == NULL) {
LogMessage(X_INFO,
- "AIGLX: %s does not export required DRI extension\n",
+ "GLX: %s does not export required DRI extension\n",
driverName);
*coreExt = *renderExt = NULL;
dlclose(driver);
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index 9de3ba1..385d869 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -461,7 +461,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
if (screen->driScreen == NULL) {
LogMessage(X_ERROR,
- "AIGLX error: Calling driver entry point failed\n");
+ "GLX error: Calling driver entry point failed\n");
goto handle_error;
}
@@ -478,7 +478,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->base.GLXminor = 4;
LogMessage(X_INFO,
- "AIGLX: Loaded and initialized %s\n", driverName);
+ "GLX: Loaded and initialized %s\n", driverName);
return &screen->base;
--
1.7.4.1
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
