[PATCH 0/1] MR3338: wined3d: Identity AMD as valid gl vendor string.
Is it just me, or am I getting déjà vu from this (a third time ?) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338
From: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> --- dlls/wined3d/adapter_gl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8cd8a883975..28f3628dd8d 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1189,6 +1189,7 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in if (strstr(gl_vendor_string, "Mesa") || strstr(gl_vendor_string, "X.Org") || strstr(gl_vendor_string, "Advanced Micro Devices, Inc.") + || strstr(gl_vendor_string, "AMD") || strstr(gl_vendor_string, "DRI R300 Project") || strstr(gl_vendor_string, "Tungsten Graphics, Inc") || strstr(gl_vendor_string, "VMware, Inc.") -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3338
I actually have this change in my local tree so merging it would be really nice (because it gets rid of the WineD3D warning) 🐸 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338#note_39070
I assume you are in fact using the Mesa drivers—can you attach your glxinfo here? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338#note_39165
@zfigura [glxinfo.txt](/uploads/792cf48a6180fcfcb8aa982016bb430d/glxinfo.txt) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338#note_39177
Huh? Isn't "Mesa" in the GL version string there? Why isn't this caught by the "strstr(gl_version, "Mesa")" clause? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338#note_39178
On Mon Jul 17 21:52:11 2023 +0000, Zebediah Figura wrote:
Huh? Isn't "Mesa" in the GL version string there? Why isn't this caught by the "strstr(gl_version, "Mesa")" clause? No, I just read the file and it says AMD is the GL vendor string
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338#note_39241
No, I just read the file and it says AMD is the GL vendor string
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338#note_39242
Sorry, misclicked...
No, I just read the file and it says AMD is the GL vendor string
I'm referring to the version string, not the vendor string. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338#note_39243
On Tue Jul 18 02:51:25 2023 +0000, Zebediah Figura wrote:
Sorry, misclicked...
No, I just read the file and it says AMD is the GL vendor string I'm referring to the version string, not the vendor string. the code doesn't appear to check for the version string
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338#note_39246
the code doesn't appear to check for the version string
Huh? It does, right here: https://source.winehq.org/git/wine.git/blob/HEAD:/dlls/wined3d/adapter_gl.c#... That's the exact line I was referring to in my earlier comment. What am I missing? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338#note_39251
On Wed Jul 19 00:44:06 2023 +0000, Zebediah Figura wrote:
the code doesn't appear to check for the version string Huh? It does, right here: https://source.winehq.org/git/wine.git/blob/HEAD:/dlls/wined3d/adapter_gl.c#... That's the exact line I was referring to in my earlier comment. What am I missing? oops I missed that line
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338#note_39360
On Wed Jul 19 00:44:06 2023 +0000, Etaash Mathamsetty wrote:
oops I missed that line yeah it doesn't work anymore since the version is just the number, there's no "Mesa" in it anymore
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338#note_39361
yeah it doesn't work anymore since the version is just the number, there's no "Mesa" in it anymore
In Aida's, or yours? I haven't seen your glxinfo yet, which is why I asked for it. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338#note_39362
On Wed Jul 19 23:18:50 2023 +0000, Zebediah Figura wrote:
yeah it doesn't work anymore since the version is just the number, there's no "Mesa" in it anymore In Aida's, or yours? I haven't seen your glxinfo yet, which is why I asked for it. I checked both before writing that comment. My glxinfo is almost identical, so I didn't think to upload it
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338#note_39567
@etaash.mathamsetty This issue seems to be fixed in a recent Wine version so you can close this MR :frog: -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338#note_53896
This merge request was closed by Etaash Mathamsetty. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3338
participants (4)
-
Aida Jonikienė -
Etaash Mathamsetty
-
Etaash Mathamsetty (＠etaash.mathamsetty)
-
Zebediah Figura (＠zfigura)