From: Connor McAdams cmcadams@codeweavers.com
Signed-off-by: Connor McAdams cmcadams@codeweavers.com --- dlls/d3dx9_36/surface.c | 32 ++++++++++++++++++++++++-------- dlls/d3dx9_36/tests/surface.c | 4 ++-- 2 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 1aca50a3059..61b0283796d 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -79,6 +79,8 @@ static const GUID *wic_guid_from_d3dformat(D3DFORMAT format) return NULL; }
+#define DDS_PALETTE_SIZE (sizeof(PALETTEENTRY) * 256) + /* dds_header.flags */ #define DDS_CAPS 0x1 #define DDS_HEIGHT 0x2 @@ -92,6 +94,7 @@ static const GUID *wic_guid_from_d3dformat(D3DFORMAT format) /* dds_header.caps */ #define DDSCAPS_ALPHA 0x2 #define DDS_CAPS_COMPLEX 0x8 +#define DDSCAPS_PALETTE 0x100 #define DDS_CAPS_TEXTURE 0x1000 #define DDS_CAPS_MIPMAP 0x400000
@@ -481,6 +484,8 @@ static HRESULT d3dx_init_dds_header(struct dds_header *header, D3DRESOURCETYPE r header->caps = DDS_CAPS_TEXTURE; if (header->pixel_format.flags & DDS_PF_ALPHA || header->pixel_format.flags & DDS_PF_ALPHA_ONLY) header->caps |= DDSCAPS_ALPHA; + if (header->pixel_format.flags & DDS_PF_INDEXED) + header->caps |= DDSCAPS_PALETTE;
return D3D_OK; } @@ -502,6 +507,7 @@ static HRESULT d3dx_save_pixels_to_memory(struct d3dx_pixels *src_pixels, const case D3DXIFF_DDS: { struct dds_header *header; + uint32_t header_size;
hr = dds_pixel_format_from_d3dx_pixel_format_id(NULL, dst_format); if (FAILED(hr)) @@ -513,15 +519,19 @@ static HRESULT d3dx_save_pixels_to_memory(struct d3dx_pixels *src_pixels, const if (FAILED(hr)) return hr;
- hr = D3DXCreateBuffer(dst_slice_pitch + sizeof(*header), &buffer); + header_size = is_index_format(dst_fmt_desc) ? sizeof(*header) + DDS_PALETTE_SIZE : sizeof(*header); + hr = D3DXCreateBuffer(dst_slice_pitch + header_size, &buffer); if (FAILED(hr)) return hr;
header = ID3DXBuffer_GetBufferPointer(buffer); - pixels = (uint8_t *)ID3DXBuffer_GetBufferPointer(buffer) + sizeof(*header); + pixels = (uint8_t *)ID3DXBuffer_GetBufferPointer(buffer) + header_size; hr = d3dx_init_dds_header(header, D3DRTYPE_TEXTURE, dst_format, &src_pixels->size, 1); if (FAILED(hr)) goto exit; + if (is_index_format(dst_fmt_desc)) + memcpy((uint8_t *)ID3DXBuffer_GetBufferPointer(buffer) + sizeof(*header), src_pixels->palette, + DDS_PALETTE_SIZE); break; }
@@ -549,7 +559,8 @@ exit: return hr; }
-static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSurface9 *src_surface, const RECT *src_rect) +static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSurface9 *src_surface, + const PALETTEENTRY *src_palette, const RECT *src_rect) { const struct pixel_format_desc *src_fmt_desc; D3DSURFACE_DESC src_surface_desc; @@ -565,6 +576,12 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur if (is_unknown_format(src_fmt_desc)) return E_NOTIMPL;
+ if (!src_palette && is_index_format(src_fmt_desc)) + { + FIXME("Default palette unimplemented.\n"); + return E_NOTIMPL; + } + if (src_rect) { if (src_rect->left > src_rect->right || src_rect->right > src_surface_desc.Width @@ -585,7 +602,7 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur if (FAILED(hr)) return hr;
- hr = d3dx_pixels_init(locked_rect.pBits, locked_rect.Pitch, 0, NULL, src_fmt_desc->format, + hr = d3dx_pixels_init(locked_rect.pBits, locked_rect.Pitch, 0, src_palette, src_fmt_desc->format, src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, 0, 1, &src_pixels); if (FAILED(hr)) { @@ -665,7 +682,6 @@ static BOOL d3dx_get_image_file_format_from_file_signature(const void *src_data, return FALSE; }
-#define DDS_PALETTE_SIZE (sizeof(PALETTEENTRY) * 256) static HRESULT d3dx_initialize_image_from_dds(const void *src_data, uint32_t src_data_size, struct d3dx_image *image, uint32_t starting_mip_level) { @@ -2958,9 +2974,9 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE if (!dst_buffer || !src_surface) return D3DERR_INVALIDCALL;
IDirect3DSurface9_GetDesc(src_surface, &src_surface_desc); - if (src_palette || is_index_format(get_format_info(src_surface_desc.Format))) + if (file_format != D3DXIFF_DDS && (src_palette || is_index_format(get_format_info(src_surface_desc.Format)))) { - FIXME("Saving surfaces with palettized pixel formats is not implemented yet.\n"); + FIXME("Saving surfaces with palettized pixel formats to non-DDS files is not implemented yet.\n"); return D3DERR_INVALIDCALL; }
@@ -2977,7 +2993,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE container_format = &GUID_ContainerFormatJpeg; break; case D3DXIFF_DDS: - return save_dds_surface_to_memory(dst_buffer, src_surface, src_rect); + return save_dds_surface_to_memory(dst_buffer, src_surface, src_palette, src_rect); case D3DXIFF_HDR: case D3DXIFF_PFM: case D3DXIFF_TGA: diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 198cb8bc841..80343934cea 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -3534,14 +3534,14 @@ static void test_save_surface_to_dds(IDirect3DDevice9 *device) { D3D_OK, { 32, DDS_PF_INDEXED, 0, 8, 0, 0, 0, 0 }, DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT, 4, 4, 0, 0, 0, DDSCAPS_TEXTURE | DDSCAPS_PALETTE, 0, PALETTED_DDS_FILE_HEADER_SIZE + (4 * 4) - }, .todo_hr = TRUE + } }, { D3DFMT_A8P8, 4, 4, test_palette, { D3D_OK, { 32, DDS_PF_INDEXED | DDS_PF_ALPHA, 0, 16, 0, 0, 0, 0xff00 }, DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PIXELFORMAT, 4, 4, 0, 0, 0, DDSCAPS_TEXTURE | DDSCAPS_PALETTE | DDSCAPS_ALPHA, 0, PALETTED_DDS_FILE_HEADER_SIZE + (4 * 2 * 4) - }, .todo_hr = TRUE + } }, /* If a palette isn't provided, d3dx converts to D3DFMT_A8R8G8B8. */ { D3DFMT_P8, 4, 4, NULL,