marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
139,758 Commits
5 Branches
0 Tags
985 MiB
Commit Graph

665 Commits (cfeefc6b94c6517d169e055eb291188cb42c37b5)

Author SHA1 Message Date
Paul Gofman cfeefc6b94 wined3d: Set user memory separately for texture sub resources. 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43232
Signed-off-by: Paul Gofman <pgofman@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-06-17 18:35:07 +02:00
Zhiyi Zhang d3e088cc00 wined3d: Specify a wined3d output for swapchain creation. 
As tests showed, DirectDraw, Direct3D 8 and 9 always use the adapter
specified in the device creation parameters regardless of the device
window position when creating a swapchain. Whereas DXGI uses the device
window position to determine which DXGI output to use.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-05-13 22:07:32 +02:00
Chip Davis ee6b083173 d3d9: Remove an unneeded conversion. 
That parameter is already the correct type.

Signed-off-by: Chip Davis <cdavis@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-08 21:01:18 +02:00
Chip Davis 31d9d0f7f3 d3d9: Explicitly cast FourCC formats in d3dformat_from_wined3dformat() and wined3dformat_from_d3dformat(). 
Signed-off-by: Chip Davis <cdavis@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-06 21:21:42 +02:00
Henri Verbeet 4984221976 d3d9: Introduce a helper to convert d3d9 primitive types to wined3d types. 
Signed-off-by: Chip Davis <cdavis@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-02 12:57:41 +02:00
Henri Verbeet 91a8266987 d3d9: Introduce a helper to convert d3d9 sampler states to wined3d states. 
Signed-off-by: Chip Davis <cdavis@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-02 12:57:39 +02:00
Henri Verbeet 705de1ea00 d3d9: Introduce a helper to convert d3d9 render states to wined3d states. 
Signed-off-by: Chip Davis <cdavis@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-02 12:57:35 +02:00
Henri Verbeet 4393d284fd d3d9: Introduce a helper to convert d3d9 transform states to wined3d states. 
Signed-off-by: Chip Davis <cdavis@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-02 12:57:32 +02:00
Henri Verbeet 1690009673 d3d9: Introduce a helper to convert d3d9 texture filter types to wined3d types. 
Signed-off-by: Chip Davis <cdavis@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-02 12:57:29 +02:00
Henri Verbeet fb408f1662 d3d9: Introduce a helper to convert d3d9 device types to wined3d types. 
Signed-off-by: Chip Davis <cdavis@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-02 12:57:25 +02:00
Henri Verbeet 4997657116 d3d9: Introduce helpers to convert between d3d9 and wined3d scanline ordering types. 
Signed-off-by: Chip Davis <cdavis@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-02 12:57:19 +02:00
Chip Davis 5b70e3321a d3d9: Introduce helpers to convert between d3d9 and wined3d multisample types. 
Signed-off-by: Chip Davis <cdavis@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-04-02 12:57:17 +02:00
Zhiyi Zhang 49bf4a8707 wined3d: Move cursor size check against display mode out of wined3d_device_set_cursor_properties(). 
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-03-31 17:24:16 +02:00
Zhiyi Zhang 669cac9852 d3d9: Report d3d9 adapter ordinal in d3d9_device_GetCreationParameters(). 
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-03-23 21:30:29 +01:00
Zhiyi Zhang 2c39a955f4 d3d9: Report d3d9 adapter group information in device caps. 
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-03-19 20:25:01 +01:00
Matteo Bruni 038b561b10 wined3d: Get rid of the vertex sampler offset. 
Do the offsetting in d3d9 instead.

Notice that this also fixes vertex sampler handling in
wined3d_stateblock_apply(), since it was using the adjusted "stage" to index
the sampler_states[] array. (Coverity)

Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-03-16 21:37:35 +01:00
Zhiyi Zhang e6368b9c10 wined3d: Pass a struct wined3d_adapter pointer to wined3d_get_device_caps(). 
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-03-16 21:30:58 +01:00
Zhiyi Zhang f2a850c844 wined3d: Pass a struct wined3d_adapter pointer to wined3d_check_device_format(). 
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-03-11 15:55:13 +01:00
Zhiyi Zhang a8072e0841 wined3d: Pass a struct wined3d_adapter pointer to wined3d_device_create(). 
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-03-11 15:55:00 +01:00
Matteo Bruni a9125eed37 d3d9: Store primary stateblock state pointer in the device. 
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-03-06 17:52:51 +01:00
Henri Verbeet a3ad73f9b6 d3d9: Avoid a dead assignment in d3d9_device_SetStreamSource() (Coverity). 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-03-03 20:01:43 +01:00
Zebediah Figura a3b36a34a6 d3d9: Validate the stream index in d3d9_device_SetStreamSource(). 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-20 16:13:16 +01:00
Zebediah Figura bd58d1327a d3d9: Use ARRAY_SIZE in d3d9_device_GetStreamSource(). 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-20 16:13:14 +01:00
Zebediah Figura e804df72a6 d3d9: Stop setting the device state in d3d9_device_SetLight() and d3d9_device_LightEnable(). 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-18 20:28:20 +01:00
Zebediah Figura 66f751f21c d3d9: Retrieve light state from the primary stateblock. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-18 20:28:18 +01:00
Zebediah Figura 824e27090f d3d9: Stop setting the device state in d3d9_device_SetMaterial(). 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-18 20:28:15 +01:00
Zebediah Figura 85b6123c81 d3d9: Retrieve the material from the primary stateblock. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-18 20:28:12 +01:00
Zebediah Figura 99732f85f5 d3d9: Stop setting the device state in d3d9_device_SetClipPlane(). 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-17 15:06:08 +01:00
Zebediah Figura 08bce2a648 d3d9: Retrieve clip planes from the primary stateblock. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-17 15:06:06 +01:00
Zebediah Figura 11b734b826 d3d9: Stop setting the device state in d3d9_device_SetTransform() and d3d9_device_MultiplyTransform(). 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-17 15:06:03 +01:00
Zebediah Figura 85b6cfb826 d3d9: Retrieve transform states from the primary stateblock. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-17 15:06:00 +01:00
Zebediah Figura c4851dece3 d3d9: Stop setting the device state in d3d9_device_SetTextureStageState(). 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-13 16:44:24 +01:00
Zebediah Figura 6aa0e182c2 d3d9: Retrieve texture states from the primary stateblock. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-13 16:44:24 +01:00
Zebediah Figura eac8186951 d3d9: Stop setting the device state in d3d9_device_SetSamplerState(). 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-13 16:44:24 +01:00
Zebediah Figura 5898fcc6b7 d3d9: Retrieve sampler states from the primary stateblock. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-13 16:44:24 +01:00
Zebediah Figura 3fc644562e d3d9: Stop setting the device state in d3d9_device_SetTexture(). 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-13 16:44:24 +01:00
Zebediah Figura aa18b69a66 d3d9: Retrieve textures from the primary stateblock. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-13 16:44:24 +01:00
Zebediah Figura 54cd29bd38 d3d9: Stop setting the device state when setting pixel shader constants. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-11 19:47:49 +01:00
Zebediah Figura ace7d48564 d3d9: Retrieve pixel shader constants from the primary stateblock. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-11 19:47:46 +01:00
Zebediah Figura 37af1676d2 d3d9: Stop setting the device state in d3d9_device_SetPixelShader(). 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-11 19:47:44 +01:00
Zebediah Figura 4b8d328885 d3d9: Stop setting the device state when setting vertex shader constants. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-11 19:47:41 +01:00
Zebediah Figura 57684d5597 d3d9: Retrieve vertex shader constants from the primary stateblock. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-11 19:47:39 +01:00
Zebediah Figura 7027e7779d d3d9: Retrieve the pixel shader from the primary stateblock. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-10 22:46:24 +01:00
Zebediah Figura 6acd71d17b d3d9: Stop setting the device state in d3d9_device_SetVertexShader(). 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-10 22:46:24 +01:00
Zebediah Figura 706e174817 d3d9: Retrieve the vertex shader from the primary stateblock. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-10 22:46:24 +01:00
Zebediah Figura 95d74311e8 d3d9: Stop setting the device state in d3d9_device_SetFVF(). 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-07 21:28:24 +01:00
Zebediah Figura f4db2de5eb d3d9: Stop setting the device state in d3d9_device_SetVertexDeclaration(). 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-07 21:28:24 +01:00
Zebediah Figura c50d3468cc d3d9: Retrieve the vertex declaration from the primary stateblock. 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-07 21:28:24 +01:00
Zebediah Figura c9959adc40 d3d9: Stop setting the device state in d3d9_device_SetScissorRect(). 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-07 21:28:24 +01:00
Zebediah Figura 43fc245faa d3d9: Stop setting the device state in d3d9_device_SetViewport(). 
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
 2020-02-07 21:28:24 +01:00