system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 10:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

winex11.drv: Print the architecture when showing driver problems.

Browse source
This commit is contained in:
Austin English 2013-06-25 18:52:02 -07:00 committed by Alexandre Julliard
parent eb69999a73
commit 44e69805e9
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dlls/winex11.drv/opengl.c
View file

@ -282,6 +282,8 @@ static CRITICAL_SECTION_DEBUG critsect_debug =
};
static CRITICAL_SECTION context_section = { &critsect_debug, -1, 0, 0, 0, 0 };
static const BOOL is_win64 = sizeof(void *) > sizeof(int);
static struct opengl_funcs opengl_funcs;
#define USE_GL_FUNC(name) #name,
@ -464,7 +466,8 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void)
if(pglXMakeCurrent(gdi_display, win, ctx) == 0)
{
ERR_(winediag)( "Unable to activate OpenGL context, most likely your OpenGL drivers haven't been installed correctly\n" );
ERR_(winediag)( "Unable to activate OpenGL context, most likely your %s OpenGL drivers haven't been "
"installed correctly\n", is_win64 ? "64-bit" : "32-bit" );
goto done;
}
gl_renderer = (const char *)opengl_funcs.gl.p_glGetString(GL_RENDERER);
@ -506,9 +509,10 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void)
* Detect a local X11 server by checking whether the X11 socket is a Unix socket.
*/
if(!getsockname(fd, (struct sockaddr *)&uaddr, &uaddrlen) && uaddr.sun_family == AF_UNIX)
ERR_(winediag)("Direct rendering is disabled, most likely your OpenGL drivers "
ERR_(winediag)("Direct rendering is disabled, most likely your %s OpenGL drivers "
"haven't been installed correctly (using GL renderer %s, version %s).\n",
debugstr_a(gl_renderer), debugstr_a(WineGLInfo.glVersion));
is_win64 ? "64-bit" : "32-bit", debugstr_a(gl_renderer),
debugstr_a(WineGLInfo.glVersion));
}
else
{
@ -522,9 +526,10 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void)
* it shows 'Mesa X11'.
*/
if(!strcmp(gl_renderer, "Software Rasterizer") || !strcmp(gl_renderer, "Mesa X11"))
ERR_(winediag)("The Mesa OpenGL driver is using software rendering, most likely your OpenGL "
ERR_(winediag)("The Mesa OpenGL driver is using software rendering, most likely your %s OpenGL "
"drivers haven't been installed correctly (using GL renderer %s, version %s).\n",
debugstr_a(gl_renderer), debugstr_a(WineGLInfo.glVersion));
is_win64 ? "64-bit" : "32-bit", debugstr_a(gl_renderer),
debugstr_a(WineGLInfo.glVersion));
}
ret = TRUE;