wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Ihsan Akmal : include: Add dxgi1_5.idl.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 5b4d0f17e3553c74f463ee81e72f347c8fcb15f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4d0f17e3553c74f463ee81e… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Thu Sep 21 22:29:37 2017 +0200 include: Add dxgi1_5.idl. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dxgi1_5.idl | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index f21d120..04665ef 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -71,6 +71,7 @@ IDL_SRCS = \ dxgi1_2.idl \ dxgi1_3.idl \ dxgi1_4.idl \ + dxgi1_5.idl \ dxgicommon.idl \ dxgiformat.idl \ dxgitype.idl \ diff --git a/include/dxgi1_5.idl b/include/dxgi1_5.idl new file mode 100644 index 0000000..d88d141 --- /dev/null +++ b/include/dxgi1_5.idl @@ -0,0 +1,127 @@ +/* + * Copyright 2017 Ihsan Akmal + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "dxgi1_4.idl"; + +typedef enum DXGI_OUTDUPL_FLAG +{ + DXGI_OUTDUPL_COMPOSITED_UI_CAPTURE_ONLY = 0x1, +} DXGI_OUTDUPL_FLAG; + +typedef enum DXGI_HDR_METADATA_TYPE +{ + DXGI_HDR_METADATA_TYPE_NONE = 0x0, + DXGI_HDR_METADATA_TYPE_HDR10 = 0x1, +} DXGI_HDR_METADATA_TYPE; + +typedef enum _DXGI_OFFER_RESOURCE_FLAGS +{ + DXGI_OFFER_RESOURCE_FLAG_ALLOW_DECOMMIT = 0x1, +} DXGI_OFFER_RESOURCE_FLAGS; + +typedef enum _DXGI_RECLAIM_RESOURCE_RESULTS +{ + DXGI_RECLAIM_RESOURCE_RESULT_OK = 0x0, + DXGI_RECLAIM_RESOURCE_RESULT_DISCARDED = 0x1, + DXGI_RECLAIM_RESOURCE_RESULT_NOT_COMMITTED = 0x2, +} DXGI_RECLAIM_RESOURCE_RESULTS; + +typedef enum DXGI_FEATURE +{ + DXGI_FEATURE_PRESENT_ALLOW_TEARING = 0x0, +} DXGI_FEATURE; + +typedef struct DXGI_HDR_METADATA_HDR10 +{ + UINT16 RedPrimary[2]; + UINT16 GreenPrimary[2]; + UINT16 BluePrimary[2]; + UINT16 WhitePoint[2]; + UINT MaxMasteringLuminance; + UINT MinMasteringLuminance; + UINT16 MaxContentLightLevel; + UINT16 MaxFrameAverageLightLevel; +} DXGI_HDR_METADATA_HDR10; + +[ + object, + uuid(80a07424-ab52-42eb-833c-0c42fd282d98), + local, + pointer_default(unique) +] +interface IDXGIOutput5 : IDXGIOutput4 +{ + HRESULT DuplicateOutput1( + [in] IUnknown *device, + [in] UINT flags, + [in] UINT format_count, + [in] const DXGI_FORMAT *formats, + [out] IDXGIOutputDuplication **duplication + ); +} + +[ + object, + uuid(3d585d5a-bd4a-489e-b1f4-3dbcb6452ffb), + local, + pointer_default(unique) +] +interface IDXGISwapChain4 : IDXGISwapChain3 +{ + HRESULT SetHDRMetaData( + [in] DXGI_HDR_METADATA_TYPE type, + [in] UINT size, + [in] void *metadata + ); +} + +[ + object, + uuid(95b4f95f-d8da-4ca4-9ee6-3b76d5968a10), + local, + pointer_default(unique) +] +interface IDXGIDevice4 : IDXGIDevice3 +{ + HRESULT OfferResources1( + [in] UINT resource_count, + [in] IDXGIResource *const *resources, + [in] DXGI_OFFER_RESOURCE_PRIORITY priority, + [in] UINT flags + ); + HRESULT ReclaimResources1( + [in] UINT resource_count, + [in] IDXGIResource *const *resources, + [out] DXGI_RECLAIM_RESOURCE_RESULTS *results + ); +} + +[ + object, + uuid(7632e1f5-ee65-4dca-87fd-84cd75f8838d), + local, + pointer_default(unique) +] +interface IDXGIFactory5 : IDXGIFactory4 +{ + HRESULT CheckFeatureSupport( + DXGI_FEATURE feature, + [in, out] void *support_data, + UINT support_data_size + ); +}

1 0

Ihsan Akmal : include: Add dxgi1_4.idl.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 67aa02726b4595e126c8648b734538f7b7a29394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67aa02726b4595e126c8648b7… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Thu Sep 21 22:29:36 2017 +0200 include: Add dxgi1_4.idl. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dxgi1_4.idl | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9acb0bf..f21d120 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -70,6 +70,7 @@ IDL_SRCS = \ dxgi.idl \ dxgi1_2.idl \ dxgi1_3.idl \ + dxgi1_4.idl \ dxgicommon.idl \ dxgiformat.idl \ dxgitype.idl \ diff --git a/include/dxgi1_4.idl b/include/dxgi1_4.idl new file mode 100644 index 0000000..0f63df2 --- /dev/null +++ b/include/dxgi1_4.idl @@ -0,0 +1,140 @@ +/* + * Copyright 2017 Ihsan Akmal + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "dxgi1_3.idl"; + +typedef enum DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG +{ + DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_PRESENT = 0x1, + DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG_OVERLAY_PRESENT = 0x2, +} DXGI_SWAP_CHAIN_COLOR_SPACE_SUPPORT_FLAG; + +typedef enum DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG +{ + DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG_PRESENT = 0x1, +} DXGI_OVERLAY_COLOR_SPACE_SUPPORT_FLAG; + +typedef enum DXGI_MEMORY_SEGMENT_GROUP +{ + DXGI_MEMORY_SEGMENT_GROUP_LOCAL = 0x0, + DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL = 0x1, +} DXGI_MEMORY_SEGMENT_GROUP; + +typedef struct DXGI_QUERY_VIDEO_MEMORY_INFO +{ + UINT64 Budget; + UINT64 CurrentUsage; + UINT64 AvailableForReservation; + UINT64 CurrentReservation; +} DXGI_QUERY_VIDEO_MEMORY_INFO; + +[ + object, + uuid(94d99bdb-f1f8-4ab0-b236-7da0170edab1), + local, + pointer_default(unique) +] +interface IDXGISwapChain3 : IDXGISwapChain2 +{ + UINT GetCurrentBackBufferIndex(); + HRESULT CheckColorSpaceSupport( + [in] DXGI_COLOR_SPACE_TYPE colour_space, + [out] UINT *colour_space_support + ); + HRESULT SetColorSpace1( + [in] DXGI_COLOR_SPACE_TYPE colour_space + ); + HRESULT ResizeBuffers1( + [in] UINT buffer_count, + [in] UINT width, + [in] UINT height, + [in] DXGI_FORMAT format, + [in] UINT flags, + [in] const UINT *node_mask, + [in] IUnknown *const *present_queue + ); +} + +[ + object, + uuid(dc7dca35-2196-414d-9F53-617884032a60), + local, + pointer_default(unique) +] +interface IDXGIOutput4 : IDXGIOutput3 +{ + HRESULT CheckOverlayColorSpaceSupport( + [in] DXGI_FORMAT format, + [in] DXGI_COLOR_SPACE_TYPE colour_space, + [in] IUnknown *device, + [out] UINT *flags + ); +} + +[ + object, + uuid(1bc6ea02-ef36-464f-bf0c-21ca39e5168a), + local, + pointer_default(unique) +] +interface IDXGIFactory4 : IDXGIFactory3 +{ + HRESULT EnumAdapterByLuid( + [in] LUID luid, + [in] REFIID iid, + [out] void **adapter + ); + HRESULT EnumWarpAdapter( + [in] REFIID iid, + [out] void **adapter + ); +} + +[ + object, + uuid(645967a4-1392-4310-a798-8053ce3e93fd), + local, + pointer_default(unique) +] +interface IDXGIAdapter3 : IDXGIAdapter2 +{ + HRESULT RegisterHardwareContentProtectionTeardownStatusEvent( + [in] HANDLE event, + [out] DWORD *cookie + ); + void UnregisterHardwareContentProtectionTeardownStatus( + [in] DWORD cookie + ); + HRESULT QueryVideoMemoryInfo( + [in] UINT node_index, + [in] DXGI_MEMORY_SEGMENT_GROUP segment_group, + [out] DXGI_QUERY_VIDEO_MEMORY_INFO *memory_info + ); + HRESULT SetVideoMemoryReservation( + [in] UINT node_index, + [in] DXGI_MEMORY_SEGMENT_GROUP segment_group, + [in] UINT64 reservation + ); + HRESULT RegisterVideoMemoryBudgetChangeNotificationEvent( + [in] HANDLE event, + [out] DWORD *cookie + ); + void UnregisterVideoMemoryBudgetChangeNotification( + [in] DWORD cookie + ); +}

1 0

Ihsan Akmal : include: Add dxgicommon.idl.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: f5268feeacbd86fd680f88cdfb337ceca14ad03e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5268feeacbd86fd680f88cdf… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Thu Sep 21 22:29:35 2017 +0200 include: Add dxgicommon.idl. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dxgicommon.idl | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/dxgitype.idl | 13 +---------- 3 files changed, 63 insertions(+), 12 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index edb4c3c..9acb0bf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -70,6 +70,7 @@ IDL_SRCS = \ dxgi.idl \ dxgi1_2.idl \ dxgi1_3.idl \ + dxgicommon.idl \ dxgiformat.idl \ dxgitype.idl \ dxva2api.idl \ diff --git a/include/dxgicommon.idl b/include/dxgicommon.idl new file mode 100644 index 0000000..99ace03 --- /dev/null +++ b/include/dxgicommon.idl @@ -0,0 +1,61 @@ +/* + * Copyright 2017 Ihsan Akmal + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +cpp_quote("#if 0") +typedef unsigned int UINT; +cpp_quote("#endif") + +const UINT DXGI_STANDARD_MULTISAMPLE_QUALITY_PATTERN = 0xffffffff; +const UINT DXGI_CENTER_MULTISAMPLE_QUALITY_PATTERN = 0xfffffffe; + +typedef enum DXGI_COLOR_SPACE_TYPE +{ + DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709 = 0x00, + DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709 = 0x01, + DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709 = 0x02, + DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P2020 = 0x03, + DXGI_COLOR_SPACE_RESERVED = 0x04, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_NONE_P709_X601 = 0x05, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P601 = 0x06, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P601 = 0x07, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P709 = 0x08, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P709 = 0x09, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P2020 = 0x0a, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P2020 = 0x0b, + DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020 = 0x0c, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G2084_LEFT_P2020 = 0x0d, + DXGI_COLOR_SPACE_RGB_STUDIO_G2084_NONE_P2020 = 0x0e, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_TOPLEFT_P2020 = 0x0f, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G2084_TOPLEFT_P2020 = 0x10, + DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P2020 = 0x11, + DXGI_COLOR_SPACE_YCBCR_STUDIO_GHLG_TOPLEFT_P2020 = 0x12, + DXGI_COLOR_SPACE_YCBCR_FULL_GHLG_TOPLEFT_P2020 = 0x13, + DXGI_COLOR_SPACE_CUSTOM = 0xffffffff, +} DXGI_COLOR_SPACE_TYPE; + +typedef struct DXGI_SAMPLE_DESC +{ + UINT Count; + UINT Quality; +} DXGI_SAMPLE_DESC; + +typedef struct DXGI_RATIONAL +{ + UINT Numerator; + UINT Denominator; +} DXGI_RATIONAL; diff --git a/include/dxgitype.idl b/include/dxgitype.idl index e7d2b43..a9ed571 100644 --- a/include/dxgitype.idl +++ b/include/dxgitype.idl @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +import "dxgicommon.idl"; import "dxgiformat.idl"; cpp_quote("#if 0") @@ -59,18 +60,6 @@ typedef struct _D3DCOLORVALUE cpp_quote("#endif") typedef D3DCOLORVALUE DXGI_RGBA; -typedef struct DXGI_SAMPLE_DESC -{ - UINT Count; - UINT Quality; -} DXGI_SAMPLE_DESC; - -typedef struct DXGI_RATIONAL -{ - UINT Numerator; - UINT Denominator; -} DXGI_RATIONAL; - typedef struct DXGI_MODE_DESC { UINT Width;

1 0

Henri Verbeet : include: Convert dxgiformat.h to IDL.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 00990782fdc26cf404ed18996f21d76eac2ddbf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00990782fdc26cf404ed18996… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 21 22:29:34 2017 +0200 include: Convert dxgiformat.h to IDL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 2 +- include/dcommon.idl | 2 +- include/dxgiformat.h | 147 ------------------------------------------------- include/dxgiformat.idl | 145 ++++++++++++++++++++++++++++++++++++++++++++++++ include/dxgitype.idl | 2 +- 5 files changed, 148 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00990782fdc26cf404ed1…

1 0

Henri Verbeet : include: Convert dcommon.h to IDL.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 4091704bf4a9663b9fc4efc7993036cd4fab6734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4091704bf4a9663b9fc4efc79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 21 22:29:33 2017 +0200 include: Convert dcommon.h to IDL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 2 +- include/d2d1.idl | 2 +- include/{dcommon.h => dcommon.idl} | 17 ++++++++++------- include/dwrite.idl | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 41a23d3..1f6656a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -53,6 +53,7 @@ IDL_SRCS = \ dbinit.idl \ dbprop.idl \ dbs.idl \ + dcommon.idl \ ddstream.idl \ devenum.idl \ devicetopology.idl \ @@ -294,7 +295,6 @@ HEADER_SRCS = \ dbt.h \ dciddi.h \ dciman.h \ - dcommon.h \ dde.h \ dde.rh \ ddeml.h \ diff --git a/include/d2d1.idl b/include/d2d1.idl index 4a62f7c..fbfb40d 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -17,7 +17,7 @@ */ import "unknwn.idl"; -import "dcommon.h"; +import "dcommon.idl"; import "d2dbasetypes.h"; import "d3d10_1.idl"; import "d2derr.h"; diff --git a/include/dcommon.h b/include/dcommon.idl similarity index 90% rename from include/dcommon.h rename to include/dcommon.idl index a516e8a..b77ec48 100644 --- a/include/dcommon.h +++ b/include/dcommon.idl @@ -16,10 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_DCOMMON_H -#define __WINE_DCOMMON_H +import "dxgiformat.h"; -#include "dxgiformat.h" +cpp_quote("#if 0") +typedef struct +{ + long x, y; +} POINT; +typedef unsigned int UINT32; +cpp_quote("#endif") typedef enum DWRITE_MEASURING_MODE { @@ -45,8 +50,8 @@ typedef struct D2D1_PIXEL_FORMAT typedef struct D2D_POINT_2F { - FLOAT x; - FLOAT y; + float x; + float y; } D2D_POINT_2F, D2D1_POINT_2F; typedef POINT D2D_POINT_2L, D2D1_POINT_2L; @@ -56,5 +61,3 @@ typedef struct D2D_SIZE_U UINT32 width; UINT32 height; } D2D_SIZE_U, D2D1_SIZE_U; - -#endif /* __WINE_DCOMMON_H */ diff --git a/include/dwrite.idl b/include/dwrite.idl index 06ae767..115f958 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -17,7 +17,7 @@ */ import "unknwn.idl"; -import "dcommon.h"; +import "dcommon.idl"; interface IDWriteFactory; interface IDWriteFontCollection;

1 0

Henri Verbeet : include: Convert dxgitype.h to IDL.
by Alexandre Julliard 22 Sep '17

22 Sep '17

Module: wine Branch: master Commit: 3a5c33946640823387ad669b11a61dc3313121a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5c33946640823387ad669b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 21 22:29:32 2017 +0200 include: Convert dxgitype.h to IDL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 2 +- include/dxgi.idl | 2 +- include/{dxgitype.h => dxgitype.idl} | 83 ++++++++++++++++++++---------------- 3 files changed, 48 insertions(+), 39 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 6bc63de..41a23d3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -69,6 +69,7 @@ IDL_SRCS = \ dxgi.idl \ dxgi1_2.idl \ dxgi1_3.idl \ + dxgitype.idl \ dxva2api.idl \ dyngraph.idl \ endpointvolume.idl \ @@ -369,7 +370,6 @@ HEADER_SRCS = \ dxerr9.h \ dxfile.h \ dxgiformat.h \ - dxgitype.h \ errorrep.h \ errors.h \ evcode.h \ diff --git a/include/dxgi.idl b/include/dxgi.idl index b35c891..b2e53e3 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -18,7 +18,7 @@ import "oaidl.idl"; import "ocidl.idl"; -import "dxgitype.h"; +import "dxgitype.idl"; const UINT _FACDXGI = 0x87a; diff --git a/include/dxgitype.h b/include/dxgitype.idl similarity index 58% rename from include/dxgitype.h rename to include/dxgitype.idl index 13df046..6e9ac9b 100644 --- a/include/dxgitype.h +++ b/include/dxgitype.idl @@ -16,55 +16,63 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __dxgitype_h__ -#define __dxgitype_h__ +import "dxgiformat.h"; -#include "dxgiformat.h" +cpp_quote("#if 0") +typedef unsigned int UINT; +typedef long BOOL; +cpp_quote("#endif") -#ifndef D3DCOLORVALUE_DEFINED -typedef struct _D3DCOLORVALUE { +typedef enum DXGI_MODE_ROTATION +{ + DXGI_MODE_ROTATION_UNSPECIFIED = 0x0, + DXGI_MODE_ROTATION_IDENTITY = 0x1, + DXGI_MODE_ROTATION_ROTATE90 = 0x2, + DXGI_MODE_ROTATION_ROTATE180 = 0x3, + DXGI_MODE_ROTATION_ROTATE270 = 0x4, +} DXGI_MODE_ROTATION; + +typedef enum DXGI_MODE_SCANLINE_ORDER +{ + DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED = 0x0, + DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE = 0x1, + DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST = 0x2, + DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST = 0x3, +} DXGI_MODE_SCANLINE_ORDER; + +typedef enum DXGI_MODE_SCALING +{ + DXGI_MODE_SCALING_UNSPECIFIED = 0x0, + DXGI_MODE_SCALING_CENTERED = 0x1, + DXGI_MODE_SCALING_STRETCHED = 0x2, +} DXGI_MODE_SCALING; + +cpp_quote("#ifndef D3DCOLORVALUE_DEFINED") +cpp_quote("#define D3DCOLORVALUE_DEFINED") +typedef struct _D3DCOLORVALUE +{ float r; float g; float b; float a; } D3DCOLORVALUE; -#define D3DCOLORVALUE_DEFINED -#endif - +cpp_quote("#endif") typedef D3DCOLORVALUE DXGI_RGBA; -typedef struct DXGI_SAMPLE_DESC { +typedef struct DXGI_SAMPLE_DESC +{ UINT Count; UINT Quality; } DXGI_SAMPLE_DESC; -typedef enum DXGI_MODE_ROTATION { - DXGI_MODE_ROTATION_UNSPECIFIED = 0, - DXGI_MODE_ROTATION_IDENTITY = 1, - DXGI_MODE_ROTATION_ROTATE90 = 2, - DXGI_MODE_ROTATION_ROTATE180 = 3, - DXGI_MODE_ROTATION_ROTATE270 = 4, -} DXGI_MODE_ROTATION; - -typedef enum DXGI_MODE_SCANLINE_ORDER { - DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED = 0, - DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE = 1, - DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST = 2, - DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST = 3, -} DXGI_MODE_SCANLINE_ORDER; - -typedef enum DXGI_MODE_SCALING { - DXGI_MODE_SCALING_UNSPECIFIED = 0, - DXGI_MODE_SCALING_CENTERED = 1, - DXGI_MODE_SCALING_STRETCHED = 2, -} DXGI_MODE_SCALING; - -typedef struct DXGI_RATIONAL { +typedef struct DXGI_RATIONAL +{ UINT Numerator; UINT Denominator; } DXGI_RATIONAL; -typedef struct DXGI_MODE_DESC { +typedef struct DXGI_MODE_DESC +{ UINT Width; UINT Height; DXGI_RATIONAL RefreshRate; @@ -73,7 +81,8 @@ typedef struct DXGI_MODE_DESC { DXGI_MODE_SCALING Scaling; } DXGI_MODE_DESC; -typedef struct DXGI_GAMMA_CONTROL_CAPABILITIES { +typedef struct DXGI_GAMMA_CONTROL_CAPABILITIES +{ BOOL ScaleAndOffsetSupported; float MaxConvertedValue; float MinConvertedValue; @@ -81,16 +90,16 @@ typedef struct DXGI_GAMMA_CONTROL_CAPABILITIES { float ControlPointPositions[1025]; } DXGI_GAMMA_CONTROL_CAPABILITIES; -typedef struct DXGI_RGB { +typedef struct DXGI_RGB +{ float Red; float Green; float Blue; } DXGI_RGB; -typedef struct DXGI_GAMMA_CONTROL { +typedef struct DXGI_GAMMA_CONTROL +{ DXGI_RGB Scale; DXGI_RGB Offset; DXGI_RGB GammaCurve[1025]; } DXGI_GAMMA_CONTROL; - -#endif

1 0

Rosanne DiMesio : Fix Extra comments field
by Jeremy Newman 22 Sep '17

22 Sep '17

Module: appdb Branch: master Commit: 2bc14bd60f0a804e10a98e2f3c2fc38619c7d503 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2bc14bd60f0a804e10a98e2f… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri Sep 22 11:48:26 2017 -0500 Fix Extra comments field Fixes bug 43755. Also fixes a typo in the Hardware section. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/testData.php b/include/testData.php index 86771d2..baf69f3 100644 --- a/include/testData.php +++ b/include/testData.php @@ -21,7 +21,7 @@ class testData{ var $sUsedWorkaround; var $shWorkarounds; var $sTestedRating; - var $sComments; + var $shComments; var $sSubmitTime; var $iSubmitterId; var $sGpuMfr; @@ -61,7 +61,7 @@ class testData{ $this->sUsedWorkaround = $oRow->usedWorkaround; $this->shWorkarounds = $oRow->workarounds; $this->sTestedRating = $oRow->testedRating; - $this->sComments = $oRow->comments; + $this->shComments = $oRow->comments; $this->sSubmitTime = $oRow->submitTime; $this->iSubmitterId = $oRow->submitterId; $this->sState = $oRow->state; @@ -102,7 +102,7 @@ class testData{ $this->sUsedWorkaround, $this->shWorkarounds, $this->sTestedRating, - $this->sComments, + $this->shComments, date("Y-m-d H:i:s"), $_SESSION['current']->iUserId, $this->sState, @@ -176,10 +176,10 @@ class testData{ $oOldTest->shWhatNotTested."'\nto\n'$this->shWhatNotTested'.\n"; } - if($this->sComments != $oOldTest->sComments) + if($this->shComments != $oOldTest->shComments) { $sWhatChanged .= "Extra comments was changed from\n'". - $oOldTest->sComments."'\nto\n'$this->sComments'.\n"; + $oOldTest->shComments."'\nto\n'$this->shComments'.\n"; } if($this->iDistributionId != $oOldTest->iDistributionId) @@ -271,7 +271,7 @@ class testData{ $this->sUsedWorkaround, $this->shWorkarounds, $this->sTestedRating, - $this->sComments, + $this->shComments, $this->sState, $this->sGpuMfr, $this->sGraphicsDriver, @@ -583,8 +583,8 @@ class testData{ "What does not\n{$this->shWhatDoesnt}\n". "Workarounds\n{$this->shWorkarounds}\n". "What was not tested\n{$this->shWhatNotTested}\n". - "Hardware tested\nGraphics: </ul><li>GPU: {$this->sGpuMfr}</li><li>Driver: {$this->sGraphicsDriver}</li></ul>". - "Additional Comments\n{$this->sComments}\n"; + "Hardware tested\nGraphics: <ul><li>GPU: {$this->sGpuMfr}</li><li>Driver: {$this->sGraphicsDriver}</li></ul>". + "Additional Comments\n{$this->shComments}\n"; } function CreateTestTable() @@ -907,8 +907,8 @@ class testData{ echo '<a href="https://wiki.winehq.org/AppDB_Maintainer_Rating_Definitions" target="_blank">Rating definitions</a></td></tr>',"\n"; // extra comments echo '<tr valign=top><td>Extra comments</td>',"\n"; - echo '<td><textarea name="sComments" id="extra_comments" rows=20 cols=80 class="wysiwyg">'; - echo $this->sComments.'</textarea></td></tr>',"\n"; + echo '<td><textarea name="shComments" id="extra_comments" rows=20 cols=80 class="wysiwyg">'; + echo $this->shComments.'</textarea></td></tr>',"\n"; /* Graphics hardware/driver this section could be expanded to include info on other hardware (e.g., CPU, audio) */ @@ -1100,7 +1100,7 @@ class testData{ $this->sRuns = $aValues['sRuns']; $this->sUsedWorkaround = $aValues['sUsedWorkaround']; $this->sTestedRating = $aValues['sTestedRating']; - $this->sComments = $aValues['sComments']; + $this->shComments = $aValues['shComments']; $this->sGpuMfr = $aValues['sGpuMfr']; $this->sGraphicsDriver = $aValues['sGraphicsDriver']; }

1 0

Matteo Bruni : wined3d: Advertise AUTOGENMIPMAP only for renderable and filterable formats.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 25a8773d21d0113dc5e4f9dee49d9d9dbeed347b URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a8773d21d0113dc5e4f9dee… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 21 01:07:07 2017 +0200 wined3d: Advertise AUTOGENMIPMAP only for renderable and filterable formats. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 1 - dlls/wined3d/directx.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 1d8b8a9..b24136a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6963,7 +6963,6 @@ static void test_mipmap_gen(void) D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, formats[i])); hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, formats[i]); - todo_wine_if (!renderable && hr == D3D_OK) ok((hr == D3D_OK && renderable) || hr == D3DOK_NOAUTOGEN, "Got unexpected hr %#x for %srenderable format %#x.\n", hr, renderable ? "" : "non", formats[i]); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 168e494..da66ad3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5364,7 +5364,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && !gl_info->supported[SGIS_GENERATE_MIPMAP]) + if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && (!gl_info->supported[SGIS_GENERATE_MIPMAP] + || (format->flags[gl_type] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) + != (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING))) { TRACE("No WINED3DUSAGE_AUTOGENMIPMAP support, returning WINED3DOK_NOAUTOGEN.\n"); return WINED3DOK_NOAUTOGEN;

1 0

Matteo Bruni : d3d9/tests: Add a test for nonrenderable format D3DUSAGE_AUTOGENMIPMAP support.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: cc7c6928da9ee7a0335abf76801a9cb5fcbabc69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc7c6928da9ee7a0335abf768… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 21 01:07:06 2017 +0200 d3d9/tests: Add a test for nonrenderable format D3DUSAGE_AUTOGENMIPMAP support. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index cb737e2..1d8b8a9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6921,6 +6921,18 @@ static void test_cube_textures(void) static void test_mipmap_gen(void) { + static const D3DFORMAT formats[] = + { + D3DFMT_A8R8G8B8, + D3DFMT_X8R8G8B8, + D3DFMT_A1R5G5B5, + D3DFMT_A4R4G4B4, + D3DFMT_A8, + D3DFMT_L8, + D3DFMT_A8L8, + D3DFMT_V8U8, + D3DFMT_DXT5, + }; D3DTEXTUREFILTERTYPE filter_type; IDirect3DTexture9 *texture; IDirect3DSurface9 *surface; @@ -6928,6 +6940,7 @@ static void test_mipmap_gen(void) D3DSURFACE_DESC desc; D3DLOCKED_RECT lr; IDirect3D9 *d3d; + BOOL renderable; ULONG refcount; unsigned int i; DWORD levels; @@ -6937,6 +6950,25 @@ static void test_mipmap_gen(void) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + 0, D3DRTYPE_TEXTURE, formats[i]); + if (FAILED(hr)) + { + skip("Skipping unsupported format %#x.\n", formats[i]); + continue; + } + renderable = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET, D3DRTYPE_TEXTURE, formats[i])); + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, formats[i]); + todo_wine_if (!renderable && hr == D3D_OK) + ok((hr == D3D_OK && renderable) || hr == D3DOK_NOAUTOGEN, + "Got unexpected hr %#x for %srenderable format %#x.\n", + hr, renderable ? "" : "non", formats[i]); + } + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8) != D3D_OK) {

1 0

Matteo Bruni : d3d9/tests: Properly check for mipmap autogeneration support.
by Alexandre Julliard 21 Sep '17

21 Sep '17

Module: wine Branch: master Commit: 9480e817198d7ca5f636e98cbb6f6632a852fc89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9480e817198d7ca5f636e98cb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Sep 21 01:07:05 2017 +0200 d3d9/tests: Properly check for mipmap autogeneration support. CheckDeviceFormat() returns D3DOK_NOAUTOGEN if the texture format is otherwise supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fb30636..cb737e2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6801,7 +6801,7 @@ static void test_cube_texture_mipmap_gen(IDirect3DDevice9 *device) hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_CUBETEXTURE, D3DFMT_X8R8G8B8); IDirect3D9_Release(d3d); - if (FAILED(hr)) + if (hr != D3D_OK) { skip("No cube mipmap generation support, skipping tests.\n"); return; @@ -6937,8 +6937,8 @@ static void test_mipmap_gen(void) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8))) + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8) != D3D_OK) { skip("No mipmap generation support, skipping tests.\n"); IDirect3D9_Release(d3d);

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2017