https://git.reactos.org/?p=reactos.git;a=commitdiff;h=959c06f9b33de6d31845cf9feeae0413a7c69b5e
commit 959c06f9b33de6d31845cf9feeae0413a7c69b5e Author: winesync <[email protected]> AuthorDate: Tue Jan 5 13:22:40 2021 +0100 Commit: Jérôme Gardou <[email protected]> CommitDate: Thu Feb 4 16:37:07 2021 +0100 [WINESYNC] d3dx9_36: Add support for FOURCC surface to save_dds_surface_to_memory. wine-staging patch by Christian Costa <[email protected]> --- dll/directx/wine/d3dx9_36/surface.c | 8 ++++++++ ..._FOURCC_surface_to_save_dds_surface_to_memory.diff | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c index 30d04684044..d1b13b7d0dc 100644 --- a/dll/directx/wine/d3dx9_36/surface.c +++ b/dll/directx/wine/d3dx9_36/surface.c @@ -437,6 +437,14 @@ static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_form } } + /* Reuse dds_fourcc_to_d3dformat as D3DFORMAT and FOURCC are DWORD with same values */ + if (dds_fourcc_to_d3dformat(d3dformat) != D3DFMT_UNKNOWN) + { + pixel_format->flags |= DDS_PF_FOURCC; + pixel_format->fourcc = d3dformat; + return D3D_OK; + } + WARN("Unknown pixel format %#x\n", d3dformat); return E_NOTIMPL; } diff --git a/sdk/tools/winesync/d3dx9_staging/0010-d3dx9_36__Add_support_for_FOURCC_surface_to_save_dds_surface_to_memory.diff b/sdk/tools/winesync/d3dx9_staging/0010-d3dx9_36__Add_support_for_FOURCC_surface_to_save_dds_surface_to_memory.diff new file mode 100644 index 00000000000..868fe7ce8ab --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0010-d3dx9_36__Add_support_for_FOURCC_surface_to_save_dds_surface_to_memory.diff @@ -0,0 +1,19 @@ +diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c +index ebec81f..8e2f2a2 100644 +--- a/dll/directx/wine/d3dx9_36/surface.c ++++ b/dll/directx/wine/d3dx9_36/surface.c +@@ -433,6 +433,14 @@ static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_form + } + } + ++ /* Reuse dds_fourcc_to_d3dformat as D3DFORMAT and FOURCC are DWORD with same values */ ++ if (dds_fourcc_to_d3dformat(d3dformat) != D3DFMT_UNKNOWN) ++ { ++ pixel_format->flags |= DDS_PF_FOURCC; ++ pixel_format->fourcc = d3dformat; ++ return D3D_OK; ++ } ++ + WARN("Unknown pixel format %#x\n", d3dformat); + return E_NOTIMPL; + }
