July 2014 - Wine-devel - list.winehq.org

Re: [PATCH 6/6] wined3d: Do not warn about WINED3DUSAGE_WRITEONLY.
by Henri Verbeet 07 Jul '14

07 Jul '14

On 3 June 2014 09:41, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > As the previous tests show, we can't do anything with this flag. Sort of. It may make sense to set WINED3D_BUFFER_DOUBLEBUFFER if WINED3DUSAGE_WRITEONLY isn't set.

2 7

Re: [9/9] wined3d: pass the capabilities directly to d3d_level_from_gl_info and rename it to d3d_level_from_caps
by Henri Verbeet 07 Jul '14

07 Jul '14

On 4 July 2014 00:40, Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> wrote: > - if (fragment_caps.TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) > + if (fragment_caps->TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) > return D3D7; > if (fragment_caps.MaxSimultaneousTextures > 1) > return D3D6; This doesn't compile: directx.c: In function ‘d3d_level_from_caps’: directx.c:1692:22: error: request for member ‘MaxSimultaneousTextures’ in something not a structure or union

1 0

Re: [7/9] wined3d: replace vendor specific callbacks with generic code that uses vendor specific arrays
by Henri Verbeet 07 Jul '14

07 Jul '14

On 4 July 2014 00:40, Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> wrote: > +enum wined3d_pci_device > +card_fallback_nvidia[] = static const enum wined3d_pci_device card_fallback_nvidia[] =

1 0

Re: [6/9] wined3d: Use capabilities from the shader backend or the fragment pipeline to determine the D3D level
by Henri Verbeet 07 Jul '14

07 Jul '14

On 4 July 2014 00:40, Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> wrote: > + /* wine can not use SM 4 on mesa drivers as the necessary functionality is not exposed on compatibility contexts */ Line length. (And caps, punctuation, but I don't care that much.)

1 0

Re: [5/9] wined3d: Make d3d_level_from_gl_info return an enum instead of a plain int
by Stefan Dösinger 07 Jul '14

07 Jul '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-07-04 00:40, schrieb Andrei Slăvoiu: > +enum wined3d_d3d_level > +{ > + D3D5, > + D3D6, > + D3D7, > + D3D8, > + D3D9_SM2, > + D3D9_SM3, > + D3D10, > + D3D11, > +}; I'd prefer enum values like D3D_LEVEL_5 etc. I think D3Dx is too short and generic. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTt9weAAoJEN0/YqbEcdMwZ7QP/RPzNly/5CRWpcwKFI2VAh6O IquSkL2PeTlsDRJPwiywF4lXc1IqDHnrqFRHpTfI1u+eQMijtQ2iaTMBHcClLeaY VQGg4Td2UBenMMPjVtqLsP5FAdOZEeI8cWo6dQoA/ZMakgWqz2ZJDuLq/YhSAKFU 1msCqEyGIukOyzYp5ThbQXobVwHkJYO34ORMciHpbWRu1X97fHReAZLL21zEIwVi RRQTPBF/O4KvCLzJMpLVG0F35Ki8vIeJJPS/QU0pN2H88n//SWQBPHE9Epm3KCE0 qczqa8P9SjW7eCJ/xD59mbc89tRUjwegcNnP7ItjiRDgAnwk98jbgyZbrQfTKyLU b7K8xezH6kmgC6+SotPcIVtvU9Ucw6kNLhJKtlhdiEHprhQcBXTp27+uMfWCS9Nx tsjGw8VpKJ4D6jssD7nY/b/reNZ6M3qMCQYyWiGOe1hi0gerq+ouOLBDCyTbJD2n XcifP/jj+3BuuCO8gXJwmYECutq6Ao23ziOjgKPuqKY3XLgoMwdpUo5bylmY/m4N tIzy1JnSZubbJVIxoeCp7nC4Eeq3YRaIMP3+cqmT8ogu9KDBQuwpNLSk/gW65OIO 9Og69K7gIvkrudCo5j/Vd8ir+JxcbhA9Hw+gJdcySZwLItiTmpX/yi31/1+6TLr+ cokSG4OFKv1ZB2izKi46 =y2DP -----END PGP SIGNATURE-----

2 1

Re: [4/9] wined3d: replace vendor specific callbacks with generic code that uses vendor specific renderer string tables
by Henri Verbeet 07 Jul '14

07 Jul '14

On 4 July 2014 00:40, Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> wrote: > +/* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx > + *· Trailing space. > +cards_vmware[]= { Space between ']' and '=', '{' placement. > static const struct gl_vendor_selection > { > enum wined3d_gl_vendor gl_vendor; > const char *description; /* Description of the card selector i.e. Apple OS/X Intel */ > - enum wined3d_pci_device (*select_card)(const char *gl_renderer); > + const struct > + { > + const char *renderer; > + enum wined3d_pci_device id; > + } *cards; /* To be used as cards[], pointer to the first member in an array */ This doesn't work: directx.c:2124:5: warning: initialization from incompatible pointer type [enabled by default] directx.c:2124:5: warning: (near initialization for ‘amd_gl_vendor_table[0].cards’) [enabled by default] etc. > + size_t nr_cards; /* Number of entries in the array above */ We'd generally name that "card_count", or perhaps "cards_size". > + {GL_VENDOR_APPLE, "Apple OSX AMD/ATI binary driver", cards_amd_binary, sizeof(cards_amd_binary) / sizeof(*cards_amd_binary)}, > + {GL_VENDOR_FGLRX, "AMD/ATI binary driver", cards_amd_binary, sizeof(cards_amd_binary) / sizeof(*cards_amd_binary)}, > + {GL_VENDOR_MESA, "Mesa AMD/ATI driver", cards_amd_mesa, sizeof(cards_amd_mesa) / sizeof(*cards_amd_mesa)}, Those lines are a bit long. Generally speaking, in wined3d, 100 characters is safe, 120 is the limit. Note that as a potential follow-up patch it wouldn't be very hard to merge these tables with card_vendor_table[]. > + for (j = 0; j < table[i].nr_cards; ++j) > + { > + if (strstr(gl_renderer, table[i].cards[j].renderer)) > + return table[i].cards[j].id; > + } Four space indentation, please.

1 0

Re: [2/9] wined3d: Make the card selection for binary drivers use arrays only
by Stefan Dösinger 07 Jul '14

07 Jul '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-07-04 00:40, schrieb Andrei Slăvoiu: > + /* Radeon R5xx */ > + {"X1950", CARD_AMD_RADEON_X1600}, > + {"X1900", CARD_AMD_RADEON_X1600}, > + {"X1800", CARD_AMD_RADEON_X1600}, > + {"X1650", CARD_AMD_RADEON_X1600}, > + {"X1600", CARD_AMD_RADEON_X1600}, > + /* Radeon R4xx + X1300/X1400/X1450/X1550/X2300/X2500/HD2300 (lowend R5xx) > + * Note X2300/X2500/HD2300 are R5xx GPUs with a 2xxx naming but they are still DX9-only */ > + {"HD 2300", CARD_AMD_RADEON_X700}, > + {"X2500", CARD_AMD_RADEON_X700}, > + {"X2300", CARD_AMD_RADEON_X700}, > + {"X1550", CARD_AMD_RADEON_X700}, > + {"X1450", CARD_AMD_RADEON_X700}, > + {"X1400", CARD_AMD_RADEON_X700}, > + {"X1300", CARD_AMD_RADEON_X700}, > + {"X850", CARD_AMD_RADEON_X700}, > + {"X800", CARD_AMD_RADEON_X700}, > + {"X700", CARD_AMD_RADEON_X700}, > + /* Radeon Xpress Series - onboard, DX9b, Shader 2.0, 300-400 MHz */ > + {"Radeon Xpress", CARD_AMD_RADEON_XPRESS_200M}, The last version of the binary driver that supports those cards is more than 5 years old. Unlike the Nvidia counterpart it has never been updated for newer kernels or X servers. I think it is safe to remove these cards from the binary driver handler. I guess its also safe to keep them in there though in case we have one or two users left who use ancient distros. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTt8d3AAoJEN0/YqbEcdMwQxAP/A0itG/ma629yvacZntEzfiR GjxZnCDWcxOB/q0i32QaM7iClpJq8imVUv9ZZbu7niK7JFwDvxNR8NLLHvheKY5G VaQQvH5Ueg3dUx29J4Ri+JZCgTJQGPBkYFEi2/Ba4TwxPr4ZDjMSXqH0JLcuxA0D r79RS8nFqD/8hcxfEGiv9YMoE9iJgZOjL4v67ErBL/ob0Q2S+qWf0Y9+NIhQB+3z F3JhPyuG6szBn4iVN42wCGl9eg+4/iC+OuDvmLFe4Nsu+Ggb6CyxntOZcDPDpGIa PA99942HIoiEtr3MboV7xMuMlPo6aPm5IcbKOWQMi2djqf8RnbM+rAqsK30tRwFi zqnW9vrctY+JubADF4uRcxMt5insjv6mURH8FmHEo2snmbRv93HSzSeG28Ylp4ND /2ltZHdxnAo2IoGjZX0QjBHS6giBF9DQ6WLxZcJUVbCj2oBh5+iXiSnnrsYxGv92 CRkHtySd8iSCibseyi9EwpnMzK5BIbWVz1L7fs8eM0ITGFOfatS5guWvirxT0g15 B/hf8py1gQiC/tmZQW828n/nGAmtqzwNl4PBPX1TRZz1jwxR6mg3hHIuGL13vwZB +8GEJFgRZLMRz4l2YkiuFeEohaCNq6wQ5Tlc+n3Fs/GkWoaDASd/+OZ9pc55/Mof pbXvrhc7BUFxMWoPjHH/ =1c47 -----END PGP SIGNATURE-----

2 1

Re: [1/9] wined3d: Make the card selection for binary drivers depend only on gl_renderer like it already is for the mesa drivers and remove the gl_info parameter from the select_card callback.
by Henri Verbeet 07 Jul '14

07 Jul '14

On 4 July 2014 00:40, Andrei Slăvoiu <andrei.slavoiu(a)gmail.com> wrote: > + /*Direct 3D 9 SM3*/ This is pretty minor, but could you please make that "/* Direct3D 9 SM3 */", etc.? > + {"HD 6770M",CARD_AMD_RADEON_HD6600M}, > + {"HD 6750M",CARD_AMD_RADEON_HD6600M}, Since you're touching the entire table anyway, please add some extra space here, preferably enough to make the "Radeon Xpress" entry from the next patch fit as well. > +···· > + /* Radeon R5xx */ Trailing whitespace. You missed select_card_nvidia_mesa(): directx.c:2270:5: warning: initialization from incompatible pointer type [enabled by default] directx.c:2270:5: warning: (near initialization for ‘nvidia_gl_vendor_table[1].select_card’) [enabled by default]

1 0

Re: [0/9] wined3d: Rework card pci id selection mechanism
by Henri Verbeet 07 Jul '14

07 Jul '14

> Question: is it intended to return an AMD card as fall-back for VMware? > Sort of. You could probably make an argument for always returning e.g. CARD_VMWARE_SVGA3D as fallback for VMware, but returning an AMD card is probably as good as any other.

1 0

Re: [4/9] wined3d: replace vendor specific callbacks with generic code that uses vendor specific renderer string tables
by Stefan Dösinger 06 Jul '14

06 Jul '14

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2014-07-04 00:40, schrieb Andrei Slăvoiu: > +/* See http://developer.amd.com/drivers/pc_vendor_id/Pages/default.aspx > + * > + * Beware: renderer string do not match exact card model, > + * eg HD 4800 is returned for multiple cards, even for RV790 based ones. */ This link is dead. I recommend to remove it. > static const struct gl_vendor_selection > { > enum wined3d_gl_vendor gl_vendor; > const char *description; /* Description of the card selector i.e. Apple OS/X Intel */ > - enum wined3d_pci_device (*select_card)(const char *gl_renderer); > + const struct > + { > + const char *renderer; > + enum wined3d_pci_device id; > + } *cards; /* To be used as cards[], pointer to the first member in an array */ > + size_t nr_cards; /* Number of entries in the array above */ I think it would be nicer to give the structure a name instead of declaring it twice. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBAgAGBQJTt8jBAAoJEN0/YqbEcdMwhskQAIV3GnqWmcBsxdq8rIGHUw/r lIP7nIxp65wxXSykylXJsPZDgyDGkQzb62u8StS1TBm+yjNy0sLR/A4vqHiZyUeN Kv6AAp/3xtSfykYLNw7dJKmSjhaMdXDo6tx8pB3r1KT1bygNu3tGEMmSjAnRDk94 wJPCsl1Gkl1VIPo6aNnEfaKSVAbLxCtGK1SxCZc9SznGSJLNDhNdPiqC2+s/8JUZ 2/+uSPpilHEQVyBf+pi1fnq+RXwZ23S2+Qc7IkYPegX4z75M/BP0IKo+8eXYmOP5 KLL0C6TyVOp06Q6cNUCqOVpoSu+7Mnm4aS423QUb5hlfcDTV67mgyrVYkQTwkn9h L9lxMldW/DzGMsY3GceVOZ7tm3VgTziT06FQjKcXuMknfhgPiXab2iHZYHgz7YJF hCbGA9WSeYd9UuNKu8AmeGGFuAg+IuFLfnbVSG1idF1yFT/wlaiyLnA8Vc7//cI/ PRrn8UuiUS94cNLp5lSyl8cS8kzk3hW3Nf5mkRCqSJQXvJb2mLq38Hr9VR98rCQr 9L3aIOG5HIn1Uzwng4KywtGvyNbySsgiUPJgQqQMwS3HgwAGprPt7lF0b6fTMQym v7l9/gx73pQQEpBAjBpIJPt9CAaUrhziPdciMojT/cBRhmBBDoDZJTtxe0LZorNL Yz7Iw8f+i5Pag4QlZrxF =Xnv/ -----END PGP SIGNATURE-----

2 2