From 6c033276e34891c8d2da8cd7539a50945e8c32f2 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 4 Jun 2024 07:58:31 +1000 Subject: [PATCH] Rebase against b6abacbb7b0ed2fb3557d23f716878214b156c8c. --- ...-D3DXSaveTextureToFile-to-save-simpl.patch | 20 +++++++++---------- staging/upstream-commit | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/patches/d3dx9_36-DDS/0002-d3dx9_36-Improve-D3DXSaveTextureToFile-to-save-simpl.patch b/patches/d3dx9_36-DDS/0002-d3dx9_36-Improve-D3DXSaveTextureToFile-to-save-simpl.patch index 55686ecb..9686446f 100644 --- a/patches/d3dx9_36-DDS/0002-d3dx9_36-Improve-D3DXSaveTextureToFile-to-save-simpl.patch +++ b/patches/d3dx9_36-DDS/0002-d3dx9_36-Improve-D3DXSaveTextureToFile-to-save-simpl.patch @@ -1,4 +1,4 @@ -From 28b0030ac5f486875dff6f5f34779844f1a031cf Mon Sep 17 00:00:00 2001 +From f6d47bb4eb5747fde7059271a560268080756791 Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Sun, 11 Jan 2015 16:29:30 +0100 Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple @@ -11,23 +11,23 @@ Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple 3 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h -index 5d8f5b332f8..f1f41c6e4d7 100644 +index 001a7f26f4f..b322765d164 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h -@@ -127,6 +127,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO +@@ -182,6 +182,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO IDirect3DSurface9 **temp_surface, BOOL write); HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, IDirect3DSurface9 *temp_surface, BOOL update); +HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture, + const PALETTEENTRY *src_palette); - - unsigned short float_32_to_16(const float in); - float float_16_to_32(const unsigned short in); + HRESULT d3dx_pixels_init(const void *data, uint32_t row_pitch, uint32_t slice_pitch, + const PALETTEENTRY *palette, D3DFORMAT format, uint32_t left, uint32_t top, uint32_t right, uint32_t bottom, + uint32_t front, uint32_t back, struct d3dx_pixels *pixels); diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c -index ca40018af24..9ff5b4901b8 100644 +index fb49ca5665a..2a8bd97fe2d 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c -@@ -650,6 +650,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur +@@ -560,6 +560,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur return D3D_OK; } @@ -97,7 +97,7 @@ index ca40018af24..9ff5b4901b8 100644 const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c -index 2ee79b51f79..7ceef158d07 100644 +index 52cfb1e8c34..ccbe1fcef20 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1858,10 +1858,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE @@ -113,5 +113,5 @@ index 2ee79b51f79..7ceef158d07 100644 type = IDirect3DBaseTexture9_GetType(src_texture); switch (type) -- -2.40.1 +2.43.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index 50b8fef7..1a75b5b6 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -951e0e27a743e52c75c7fedc0b1eaa9eb77e6bb6 +b6abacbb7b0ed2fb3557d23f716878214b156c8c