[Bug 28152] Heroes 6 Demo fails to find video card

[wine-bugs at winehq.org]

http://bugs.winehq.org/show_bug.cgi?id=28152

--- Comment #16 from Artem S. Tashkinov <t.artem at mailcity.com> 2011-09-13 06:16:20 CDT ---
(In reply to comment #7)
> Created an attachment (id=36094)
 --> (http://bugs.winehq.org/attachment.cgi?id=36094) [details]
> Report more vertex texture formats
> 
> This patch fixes the issue for me.
> 
> Ivan, did you apply Louis's patch correctly? Notice that there are 3 very
> similar places in directx.c which call CheckVertexTextureCapabilities.
> 
> Anyway, can you try my patch and attach a new +d3d_caps log with my patch
> applied if it still doesn't work for you?

The patch doesn't apply cleanly to wine 1.3.28 sources and subsequently wined3d
doesn't build:

$ patch -p1 < 0001-wined3d-Report-more-vertex-texture-formats.diff
patching file dlls/wined3d/directx.c
Hunk #1 succeeded at 790 with fuzz 1 (offset 14 lines).
Hunk #2 succeeded at 927 with fuzz 1 (offset 24 lines).
Hunk #3 succeeded at 1026 with fuzz 2 (offset 34 lines).
Hunk #4 FAILED at 3729.
1 out of 4 hunks FAILED -- saving rejects to file dlls/wined3d/directx.c.rej
patching file dlls/wined3d/utils.c
patching file dlls/wined3d/wined3d_private.h
Hunk #1 FAILED at 52.
Hunk #2 succeeded at 2783 (offset 12 lines).
1 out of 2 hunks FAILED -- saving rejects to file
dlls/wined3d/wined3d_private.h.rej


$ make
gcc -c -I. -I. -I../../include -I../../include  -D__WINESRC__  -D_REENTRANT
-fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement
-Wempty-body -Wstrict-prototypes -Wtype-limits -Wwrite-strings -Wpointer-arith
-Wlogical-op  -march=native -O2 -pipe  -o directx.o directx.c
directx.c:794:13: error: redefinition of ‘match_limited_vtf’
directx.c:783:13: note: previous definition of ‘match_limited_vtf’ was here
directx.c:930:13: error: redefinition of ‘quirk_limited_vtf’
directx.c:925:13: note: previous definition of ‘quirk_limited_vtf’ was here
directx.c: In function ‘CheckVertexTextureCapability’:
directx.c:3718:63: error: ‘WINED3DFMT_FLAG_VTF’ undeclared (first use in this
function)
directx.c:3718:63: note: each undeclared identifier is reported only once for
each function it appears in
directx.c: At top level:
directx.c:783:13: warning: ‘match_limited_vtf’ defined but not used
directx.c:925:13: warning: ‘quirk_limited_vtf’ defined but not used
make: *** [directx.o] Error 1

-- 
Configure bugmail: http://bugs.winehq.org/userprefs.cgi?tab=email
Do not reply to this email, post in Bugzilla using the
above URL to reply.
------- You are receiving this mail because: -------
You are watching all bug changes.