Ros-diffs February 2020

ros-diffs@reactos.org

27 participants
239 discussions

[reactos] 31/74: [WINESYNC]d3dx9_36: Implement ID3DXFontImpl_DrawText.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dead753d8f61307b517d2… commit dead753d8f61307b517d2a06452b4a7ab758d06b Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 02:11:30 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36: Implement ID3DXFontImpl_DrawText. Changes by Sebastian Lackner <sebastian(a)fds-team.de>: * Use pitch value for locked buffer instead of assuming that pitch = width * bytesperpixel * Avoid one for loop to simplify code * Ensure that DrawText doesn't dereference a NULL pointer when count != 0. Changes by Christian Costa <titan.costa(a)gmail.com> * Use dedicated variables for text width & height instead of reusing rect.right and rect.bottom * Remove useless test in pixel conversion * Remove left over 'partial stub' in fixme Changes by Sebastian Lackner <sebastian(a)fds-team.de>: * Replace code to convert text from ascii to widechar * Strip terminating NULL chars before drawing text wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/font.c | 229 +++++++++++++-- ...d3dx9_36__Implement_ID3DXFontImpl_DrawText.diff | 308 +++++++++++++++++++++ 2 files changed, 518 insertions(+), 19 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/font.c b/dll/directx/wine/d3dx9_36/font.c index 418a3be3328..2e2f6964c45 100644 --- a/dll/directx/wine/d3dx9_36/font.c +++ b/dll/directx/wine/d3dx9_36/font.c @@ -35,8 +35,29 @@ struct d3dx_font HDC hdc; HFONT hfont; + + UINT tex_width; + UINT tex_height; + IDirect3DTexture9 *texture; + HBITMAP bitmap; + BYTE *bits; }; +/* Returns the smallest power of 2 which is greater than or equal to num */ +static UINT make_pow2(UINT num) +{ + UINT result = 1; + + /* In the unlikely event somebody passes a large value, make sure we don't enter an infinite loop */ + if (num >= 0x80000000) + return 0x80000000; + + while (result < num) + result <<= 1; + + return result; +} + static inline struct d3dx_font *impl_from_ID3DXFont(ID3DXFont *iface) { return CONTAINING_RECORD(iface, struct d3dx_font, ID3DXFont_iface); @@ -63,19 +84,27 @@ static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid static ULONG WINAPI ID3DXFontImpl_AddRef(ID3DXFont *iface) { struct d3dx_font *This = impl_from_ID3DXFont(iface); - ULONG ref=InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("%p increasing refcount to %u\n", iface, ref); + return ref; } static ULONG WINAPI ID3DXFontImpl_Release(ID3DXFont *iface) { struct d3dx_font *This = impl_from_ID3DXFont(iface); - ULONG ref=InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->ref); TRACE("%p decreasing refcount to %u\n", iface, ref); - if(ref==0) { + if (!ref) + { + if (This->texture) + { + IDirect3DTexture9_Release(This->texture); + DeleteObject(This->bitmap); + } DeleteObject(This->hfont); DeleteDC(This->hdc); IDirect3DDevice9_Release(This->device); @@ -178,17 +207,170 @@ static HRESULT WINAPI ID3DXFontImpl_PreloadTextW(ID3DXFont *iface, const WCHAR * static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, const char *string, INT count, RECT *rect, DWORD format, D3DCOLOR color) { - FIXME("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x stub!\n", + LPWSTR stringW; + INT countW, ret = 0; + + TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n", iface, sprite, debugstr_a(string), count, wine_dbgstr_rect(rect), format, color); - return 1; + + if (!string || count <= 0) + return 0; + + countW = MultiByteToWideChar(CP_ACP, 0, string, count, NULL, 0); + stringW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)); + if (stringW) + { + MultiByteToWideChar(CP_ACP, 0, string, count, stringW, countW); + ret = ID3DXFont_DrawTextW(iface, sprite, stringW, countW, rect, format, color); + HeapFree(GetProcessHeap(), 0, stringW); + } + + return ret; } static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, const WCHAR *string, INT count, RECT *rect, DWORD format, D3DCOLOR color) { - FIXME("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x stub!\n", + struct d3dx_font *This = impl_from_ID3DXFont(iface); + RECT calc_rect = *rect; + INT height; + + TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n", iface, sprite, debugstr_w(string), count, wine_dbgstr_rect(rect), format, color); - return 1; + + if (!string || count <= 0) + return 0; + + /* Strip terminating NULL characters */ + while (count > 0 && !string[count-1]) + count--; + + height = DrawTextW(This->hdc, string, count, &calc_rect, format | DT_CALCRECT); + + if (format & DT_CALCRECT) + { + *rect = calc_rect; + return height; + } + + if (height && (calc_rect.left < calc_rect.right)) + { + D3DLOCKED_RECT locked_rect; + D3DXVECTOR3 position; + UINT text_width, text_height; + RECT text_rect; + ID3DXSprite *target = sprite; + HRESULT hr; + int i, j; + + /* Get rect position and dimensions */ + position.x = calc_rect.left; + position.y = calc_rect.top; + position.z = 0; + text_width = calc_rect.right - calc_rect.left; + text_height = calc_rect.bottom - calc_rect.top; + text_rect.left = 0; + text_rect.top = 0; + text_rect.right = text_width; + text_rect.bottom = text_height; + + /* We need to flush as it seems all draws in the begin/end sequence use only the latest updated texture */ + if (sprite) + ID3DXSprite_Flush(sprite); + + /* Extend texture and DIB section to contain text */ + if ((text_width > This->tex_width) || (text_height > This->tex_height)) + { + BITMAPINFOHEADER header; + + if (text_width > This->tex_width) + This->tex_width = make_pow2(text_width); + if (text_height > This->tex_height) + This->tex_height = make_pow2(text_height); + + if (This->texture) + { + IDirect3DTexture9_Release(This->texture); + DeleteObject(This->bitmap); + } + + hr = D3DXCreateTexture(This->device, This->tex_width, This->tex_height, 1, 0, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &This->texture); + if (FAILED(hr)) + { + This->texture = NULL; + return 0; + } + + header.biSize = sizeof(header); + header.biWidth = This->tex_width; + header.biHeight = -This->tex_height; + header.biPlanes = 1; + header.biBitCount = 32; + header.biCompression = BI_RGB; + header.biSizeImage = sizeof(DWORD) * This->tex_width * This->tex_height; + header.biXPelsPerMeter = 0; + header.biYPelsPerMeter = 0; + header.biClrUsed = 0; + header.biClrImportant = 0; + + This->bitmap = CreateDIBSection(This->hdc, (const BITMAPINFO*)&header, + DIB_RGB_COLORS, (void**)&This->bits, NULL, 0); + if (!This->bitmap) + { + IDirect3DTexture9_Release(This->texture); + This->texture = NULL; + return 0; + } + + SelectObject(This->hdc, This->bitmap); + } + + if (FAILED(IDirect3DTexture9_LockRect(This->texture, 0, &locked_rect, &text_rect, D3DLOCK_DISCARD))) + return 0; + + /* Clear rect */ + for (i = 0; i < text_height; i++) + memset(This->bits + i * This->tex_width * sizeof(DWORD), 0, + text_width * sizeof(DWORD)); + + DrawTextW(This->hdc, string, count, &text_rect, format); + + /* All RGB components are equal so take one as alpha and set RGB + * color to white, so it can be modulated with color parameter */ + for (i = 0; i < text_height; i++) + { + DWORD *src = (DWORD *)This->bits + i * This->tex_width; + DWORD *dst = (DWORD *)((BYTE *)locked_rect.pBits + i * locked_rect.Pitch); + for (j = 0; j < text_width; j++) + { + *dst++ = (*src++ << 24) | 0xFFFFFF; + } + } + + IDirect3DTexture9_UnlockRect(This->texture, 0); + + if (!sprite) + { + hr = D3DXCreateSprite(This->device, &target); + if (FAILED(hr)) + return 0; + ID3DXSprite_Begin(target, 0); + } + + hr = target->lpVtbl->Draw(target, This->texture, &text_rect, NULL, &position, color); + + if (!sprite) + { + ID3DXSprite_End(target); + ID3DXSprite_Release(target); + } + + if (FAILED(hr)) + return 0; + } + + return height; } static HRESULT WINAPI ID3DXFontImpl_OnLostDevice(ID3DXFont *iface) @@ -301,46 +483,55 @@ HRESULT WINAPI D3DXCreateFontIndirectW(IDirect3DDevice9 *device, const D3DXFONT_ TRACE("(%p, %p, %p)\n", device, desc, font); - if( !device || !desc || !font ) return D3DERR_INVALIDCALL; + if (!device || !desc || !font) return D3DERR_INVALIDCALL; + + TRACE("desc: %d %d %d %d %d %d %d %d %d %s\n", desc->Height, desc->Width, desc->Weight, desc->MipLevels, desc->Italic, + desc->CharSet, desc->OutputPrecision, desc->Quality, desc->PitchAndFamily, debugstr_w(desc->FaceName)); - /* the device MUST support D3DFMT_A8R8G8B8 */ + /* The device MUST support D3DFMT_A8R8G8B8 */ IDirect3DDevice9_GetDirect3D(device, &d3d); IDirect3DDevice9_GetCreationParameters(device, &cpars); IDirect3DDevice9_GetDisplayMode(device, 0, &mode); hr = IDirect3D9_CheckDeviceFormat(d3d, cpars.AdapterOrdinal, cpars.DeviceType, mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8); - if(FAILED(hr)) { + if (FAILED(hr)) + { IDirect3D9_Release(d3d); return D3DXERR_INVALIDDATA; } IDirect3D9_Release(d3d); - object = HeapAlloc(GetProcessHeap(), 0, sizeof(struct d3dx_font)); - if(object==NULL) { - *font=NULL; + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct d3dx_font)); + if (!object) + { + *font = NULL; return E_OUTOFMEMORY; } object->ID3DXFont_iface.lpVtbl = &D3DXFont_Vtbl; - object->ref=1; - object->device=device; - object->desc=*desc; + object->ref = 1; + object->device = device; + object->desc = *desc; object->hdc = CreateCompatibleDC(NULL); - if( !object->hdc ) { + if (!object->hdc) + { HeapFree(GetProcessHeap(), 0, object); return D3DXERR_INVALIDDATA; } object->hfont = CreateFontW(desc->Height, desc->Width, 0, 0, desc->Weight, desc->Italic, FALSE, FALSE, desc->CharSet, desc->OutputPrecision, CLIP_DEFAULT_PRECIS, desc->Quality, desc->PitchAndFamily, desc->FaceName); - if( !object->hfont ) { + if (!object->hfont) + { DeleteDC(object->hdc); HeapFree(GetProcessHeap(), 0, object); return D3DXERR_INVALIDDATA; } SelectObject(object->hdc, object->hfont); + SetTextColor(object->hdc, 0x00ffffff); + SetBkColor(object->hdc, 0x00000000); IDirect3DDevice9_AddRef(device); - *font=&object->ID3DXFont_iface; + *font = &object->ID3DXFont_iface; return D3D_OK; } diff --git a/sdk/tools/winesync/d3dx9_staging/0015-d3dx9_36__Implement_ID3DXFontImpl_DrawText.diff b/sdk/tools/winesync/d3dx9_staging/0015-d3dx9_36__Implement_ID3DXFontImpl_DrawText.diff new file mode 100644 index 00000000000..bd5a4b28173 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0015-d3dx9_36__Implement_ID3DXFontImpl_DrawText.diff @@ -0,0 +1,308 @@ +diff --git a/dll/directx/wine/d3dx9_36/font.c b/dll/directx/wine/d3dx9_36/font.c +index 418a3be..2e2f696 100644 +--- a/dll/directx/wine/d3dx9_36/font.c ++++ b/dll/directx/wine/d3dx9_36/font.c +@@ -35,8 +35,29 @@ struct d3dx_font + + HDC hdc; + HFONT hfont; ++ ++ UINT tex_width; ++ UINT tex_height; ++ IDirect3DTexture9 *texture; ++ HBITMAP bitmap; ++ BYTE *bits; + }; + ++/* Returns the smallest power of 2 which is greater than or equal to num */ ++static UINT make_pow2(UINT num) ++{ ++ UINT result = 1; ++ ++ /* In the unlikely event somebody passes a large value, make sure we don't enter an infinite loop */ ++ if (num >= 0x80000000) ++ return 0x80000000; ++ ++ while (result < num) ++ result <<= 1; ++ ++ return result; ++} ++ + static inline struct d3dx_font *impl_from_ID3DXFont(ID3DXFont *iface) + { + return CONTAINING_RECORD(iface, struct d3dx_font, ID3DXFont_iface); +@@ -63,19 +84,27 @@ static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid + static ULONG WINAPI ID3DXFontImpl_AddRef(ID3DXFont *iface) + { + struct d3dx_font *This = impl_from_ID3DXFont(iface); +- ULONG ref=InterlockedIncrement(&This->ref); ++ ULONG ref = InterlockedIncrement(&This->ref); ++ + TRACE("%p increasing refcount to %u\n", iface, ref); ++ + return ref; + } + + static ULONG WINAPI ID3DXFontImpl_Release(ID3DXFont *iface) + { + struct d3dx_font *This = impl_from_ID3DXFont(iface); +- ULONG ref=InterlockedDecrement(&This->ref); ++ ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("%p decreasing refcount to %u\n", iface, ref); + +- if(ref==0) { ++ if (!ref) ++ { ++ if (This->texture) ++ { ++ IDirect3DTexture9_Release(This->texture); ++ DeleteObject(This->bitmap); ++ } + DeleteObject(This->hfont); + DeleteDC(This->hdc); + IDirect3DDevice9_Release(This->device); +@@ -178,17 +207,170 @@ static HRESULT WINAPI ID3DXFontImpl_PreloadTextW(ID3DXFont *iface, const WCHAR * + static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, + const char *string, INT count, RECT *rect, DWORD format, D3DCOLOR color) + { +- FIXME("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x stub!\n", ++ LPWSTR stringW; ++ INT countW, ret = 0; ++ ++ TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n", + iface, sprite, debugstr_a(string), count, wine_dbgstr_rect(rect), format, color); +- return 1; ++ ++ if (!string || count <= 0) ++ return 0; ++ ++ countW = MultiByteToWideChar(CP_ACP, 0, string, count, NULL, 0); ++ stringW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)); ++ if (stringW) ++ { ++ MultiByteToWideChar(CP_ACP, 0, string, count, stringW, countW); ++ ret = ID3DXFont_DrawTextW(iface, sprite, stringW, countW, rect, format, color); ++ HeapFree(GetProcessHeap(), 0, stringW); ++ } ++ ++ return ret; + } + + static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, + const WCHAR *string, INT count, RECT *rect, DWORD format, D3DCOLOR color) + { +- FIXME("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x stub!\n", ++ struct d3dx_font *This = impl_from_ID3DXFont(iface); ++ RECT calc_rect = *rect; ++ INT height; ++ ++ TRACE("iface %p, sprite %p, string %s, count %d, rect %s, format %#x, color 0x%08x\n", + iface, sprite, debugstr_w(string), count, wine_dbgstr_rect(rect), format, color); +- return 1; ++ ++ if (!string || count <= 0) ++ return 0; ++ ++ /* Strip terminating NULL characters */ ++ while (count > 0 && !string[count-1]) ++ count--; ++ ++ height = DrawTextW(This->hdc, string, count, &calc_rect, format | DT_CALCRECT); ++ ++ if (format & DT_CALCRECT) ++ { ++ *rect = calc_rect; ++ return height; ++ } ++ ++ if (height && (calc_rect.left < calc_rect.right)) ++ { ++ D3DLOCKED_RECT locked_rect; ++ D3DXVECTOR3 position; ++ UINT text_width, text_height; ++ RECT text_rect; ++ ID3DXSprite *target = sprite; ++ HRESULT hr; ++ int i, j; ++ ++ /* Get rect position and dimensions */ ++ position.x = calc_rect.left; ++ position.y = calc_rect.top; ++ position.z = 0; ++ text_width = calc_rect.right - calc_rect.left; ++ text_height = calc_rect.bottom - calc_rect.top; ++ text_rect.left = 0; ++ text_rect.top = 0; ++ text_rect.right = text_width; ++ text_rect.bottom = text_height; ++ ++ /* We need to flush as it seems all draws in the begin/end sequence use only the latest updated texture */ ++ if (sprite) ++ ID3DXSprite_Flush(sprite); ++ ++ /* Extend texture and DIB section to contain text */ ++ if ((text_width > This->tex_width) || (text_height > This->tex_height)) ++ { ++ BITMAPINFOHEADER header; ++ ++ if (text_width > This->tex_width) ++ This->tex_width = make_pow2(text_width); ++ if (text_height > This->tex_height) ++ This->tex_height = make_pow2(text_height); ++ ++ if (This->texture) ++ { ++ IDirect3DTexture9_Release(This->texture); ++ DeleteObject(This->bitmap); ++ } ++ ++ hr = D3DXCreateTexture(This->device, This->tex_width, This->tex_height, 1, 0, ++ D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &This->texture); ++ if (FAILED(hr)) ++ { ++ This->texture = NULL; ++ return 0; ++ } ++ ++ header.biSize = sizeof(header); ++ header.biWidth = This->tex_width; ++ header.biHeight = -This->tex_height; ++ header.biPlanes = 1; ++ header.biBitCount = 32; ++ header.biCompression = BI_RGB; ++ header.biSizeImage = sizeof(DWORD) * This->tex_width * This->tex_height; ++ header.biXPelsPerMeter = 0; ++ header.biYPelsPerMeter = 0; ++ header.biClrUsed = 0; ++ header.biClrImportant = 0; ++ ++ This->bitmap = CreateDIBSection(This->hdc, (const BITMAPINFO*)&header, ++ DIB_RGB_COLORS, (void**)&This->bits, NULL, 0); ++ if (!This->bitmap) ++ { ++ IDirect3DTexture9_Release(This->texture); ++ This->texture = NULL; ++ return 0; ++ } ++ ++ SelectObject(This->hdc, This->bitmap); ++ } ++ ++ if (FAILED(IDirect3DTexture9_LockRect(This->texture, 0, &locked_rect, &text_rect, D3DLOCK_DISCARD))) ++ return 0; ++ ++ /* Clear rect */ ++ for (i = 0; i < text_height; i++) ++ memset(This->bits + i * This->tex_width * sizeof(DWORD), 0, ++ text_width * sizeof(DWORD)); ++ ++ DrawTextW(This->hdc, string, count, &text_rect, format); ++ ++ /* All RGB components are equal so take one as alpha and set RGB ++ * color to white, so it can be modulated with color parameter */ ++ for (i = 0; i < text_height; i++) ++ { ++ DWORD *src = (DWORD *)This->bits + i * This->tex_width; ++ DWORD *dst = (DWORD *)((BYTE *)locked_rect.pBits + i * locked_rect.Pitch); ++ for (j = 0; j < text_width; j++) ++ { ++ *dst++ = (*src++ << 24) | 0xFFFFFF; ++ } ++ } ++ ++ IDirect3DTexture9_UnlockRect(This->texture, 0); ++ ++ if (!sprite) ++ { ++ hr = D3DXCreateSprite(This->device, &target); ++ if (FAILED(hr)) ++ return 0; ++ ID3DXSprite_Begin(target, 0); ++ } ++ ++ hr = target->lpVtbl->Draw(target, This->texture, &text_rect, NULL, &position, color); ++ ++ if (!sprite) ++ { ++ ID3DXSprite_End(target); ++ ID3DXSprite_Release(target); ++ } ++ ++ if (FAILED(hr)) ++ return 0; ++ } ++ ++ return height; + } + + static HRESULT WINAPI ID3DXFontImpl_OnLostDevice(ID3DXFont *iface) +@@ -301,46 +483,55 @@ HRESULT WINAPI D3DXCreateFontIndirectW(IDirect3DDevice9 *device, const D3DXFONT_ + + TRACE("(%p, %p, %p)\n", device, desc, font); + +- if( !device || !desc || !font ) return D3DERR_INVALIDCALL; ++ if (!device || !desc || !font) return D3DERR_INVALIDCALL; ++ ++ TRACE("desc: %d %d %d %d %d %d %d %d %d %s\n", desc->Height, desc->Width, desc->Weight, desc->MipLevels, desc->Italic, ++ desc->CharSet, desc->OutputPrecision, desc->Quality, desc->PitchAndFamily, debugstr_w(desc->FaceName)); + +- /* the device MUST support D3DFMT_A8R8G8B8 */ ++ /* The device MUST support D3DFMT_A8R8G8B8 */ + IDirect3DDevice9_GetDirect3D(device, &d3d); + IDirect3DDevice9_GetCreationParameters(device, &cpars); + IDirect3DDevice9_GetDisplayMode(device, 0, &mode); + hr = IDirect3D9_CheckDeviceFormat(d3d, cpars.AdapterOrdinal, cpars.DeviceType, mode.Format, 0, D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8); +- if(FAILED(hr)) { ++ if (FAILED(hr)) ++ { + IDirect3D9_Release(d3d); + return D3DXERR_INVALIDDATA; + } + IDirect3D9_Release(d3d); + +- object = HeapAlloc(GetProcessHeap(), 0, sizeof(struct d3dx_font)); +- if(object==NULL) { +- *font=NULL; ++ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct d3dx_font)); ++ if (!object) ++ { ++ *font = NULL; + return E_OUTOFMEMORY; + } + object->ID3DXFont_iface.lpVtbl = &D3DXFont_Vtbl; +- object->ref=1; +- object->device=device; +- object->desc=*desc; ++ object->ref = 1; ++ object->device = device; ++ object->desc = *desc; + + object->hdc = CreateCompatibleDC(NULL); +- if( !object->hdc ) { ++ if (!object->hdc) ++ { + HeapFree(GetProcessHeap(), 0, object); + return D3DXERR_INVALIDDATA; + } + + object->hfont = CreateFontW(desc->Height, desc->Width, 0, 0, desc->Weight, desc->Italic, FALSE, FALSE, desc->CharSet, + desc->OutputPrecision, CLIP_DEFAULT_PRECIS, desc->Quality, desc->PitchAndFamily, desc->FaceName); +- if( !object->hfont ) { ++ if (!object->hfont) ++ { + DeleteDC(object->hdc); + HeapFree(GetProcessHeap(), 0, object); + return D3DXERR_INVALIDDATA; + } + SelectObject(object->hdc, object->hfont); ++ SetTextColor(object->hdc, 0x00ffffff); ++ SetBkColor(object->hdc, 0x00000000); + + IDirect3DDevice9_AddRef(device); +- *font=&object->ID3DXFont_iface; ++ *font = &object->ID3DXFont_iface; + + return D3D_OK; + }

4 years, 10 months

[reactos] 30/74: [WINESYNC]d3dx9_36: add DXTn support

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30328cab077264492608e… commit 30328cab077264492608e0cf1edc9c764ebd44c6 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 02:09:33 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36: add DXTn support wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/d3dx9.cmake | 2 +- dll/directx/wine/d3dx9_36/surface.c | 102 ++++++++++- modules/rostests/winetests/d3dx9_36/surface.c | 8 +- .../0014-d3dx9_36__add_DXTn_support.diff | 203 +++++++++++++++++++++ 4 files changed, 302 insertions(+), 13 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/d3dx9.cmake b/dll/directx/wine/d3dx9_36/d3dx9.cmake index 77dd1cde119..900a8bfe887 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9.cmake +++ b/dll/directx/wine/d3dx9_36/d3dx9.cmake @@ -35,7 +35,7 @@ function(add_d3dx9_target __version) set_module_type(${module} win32dll) add_dependencies(${module} d3d_idl_headers) target_link_libraries(${module} dxguid wine) - add_importlibs(${module} d3dcompiler_43 d3dxof user32 ole32 gdi32 msvcrt kernel32 ntdll) + add_importlibs(${module} d3dcompiler_43 d3dxof d3dwine user32 ole32 gdi32 msvcrt kernel32 ntdll) add_delay_importlibs(${module} windowscodecs) add_pch(${module} ../d3dx9_36/precomp.h SOURCE) add_cd_file(TARGET ${module} DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c index d236feb0b83..3c308d36c8f 100644 --- a/dll/directx/wine/d3dx9_36/surface.c +++ b/dll/directx/wine/d3dx9_36/surface.c @@ -27,6 +27,8 @@ #include "ole2.h" #include "wincodec.h" +#include "wine/wined3d.h" + WINE_DEFAULT_DEBUG_CHANNEL(d3dx); HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**); @@ -1876,6 +1878,24 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic } } +typedef BOOL (*dxtn_conversion_func)(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, + enum wined3d_format_id format, unsigned int w, unsigned int h); + +static dxtn_conversion_func get_dxtn_conversion_func(D3DFORMAT format, BOOL encode) +{ + switch (format) + { + case D3DFMT_DXT1: + return encode ? wined3d_dxt1_encode : wined3d_dxt1_decode; + case D3DFMT_DXT3: + return encode ? wined3d_dxt3_encode : wined3d_dxt3_decode; + case D3DFMT_DXT5: + return encode ? wined3d_dxt5_encode : wined3d_dxt5_decode; + default: + return NULL; + } +} + /************************************************************ * D3DXLoadSurfaceFromMemory * @@ -1915,10 +1935,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, { const struct pixel_format_desc *srcformatdesc, *destformatdesc; IDirect3DSurface9 *surface; + void *tmp_src_memory = NULL, *tmp_dst_memory = NULL; + dxtn_conversion_func pre_convert = NULL, post_convert = NULL; D3DSURFACE_DESC surfdesc; D3DLOCKED_RECT lockrect; struct volume src_size, dst_size; - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s, %#x, 0x%08x)\n", dst_surface, dst_palette, wine_dbgstr_rect(dst_rect), src_memory, src_format, @@ -1999,18 +2021,65 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } else /* Stretching or format conversion. */ { - if (!is_conversion_from_supported(srcformatdesc) - || !is_conversion_to_supported(destformatdesc)) + UINT tmp_src_pitch, tmp_dst_pitch; + + pre_convert = get_dxtn_conversion_func(srcformatdesc->format, FALSE); + post_convert = get_dxtn_conversion_func(destformatdesc->format, TRUE); + + if ((!pre_convert && !is_conversion_from_supported(srcformatdesc)) || + (!post_convert && !is_conversion_to_supported(destformatdesc))) { FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format); unlock_surface(dst_surface, &lockrect, surface, FALSE); return E_NOTIMPL; } + /* handle pre-conversion */ + if (pre_convert) + { + tmp_src_memory = HeapAlloc(GetProcessHeap(), 0, src_size.width * src_size.height * sizeof(DWORD)); + if (!tmp_src_memory) + { + hr = E_OUTOFMEMORY; + goto done; + } + tmp_src_pitch = src_size.width * sizeof(DWORD); + if (!pre_convert(src_memory, tmp_src_memory, src_pitch, tmp_src_pitch, + WINED3DFMT_B8G8R8A8_UNORM, src_size.width, src_size.height)) + { + hr = E_FAIL; + goto done; + } + srcformatdesc = get_format_info(D3DFMT_A8R8G8B8); + } + else + { + tmp_src_memory = (void *)src_memory; + tmp_src_pitch = src_pitch; + } + + /* handle post-conversion */ + if (post_convert) + { + tmp_dst_memory = HeapAlloc(GetProcessHeap(), 0, dst_size.width * dst_size.height * sizeof(DWORD)); + if (!tmp_dst_memory) + { + hr = E_OUTOFMEMORY; + goto done; + } + tmp_dst_pitch = dst_size.width * sizeof(DWORD); + destformatdesc = get_format_info(D3DFMT_A8R8G8B8); + } + else + { + tmp_dst_memory = lockrect.pBits; + tmp_dst_pitch = lockrect.Pitch; + } + if ((filter & 0xf) == D3DX_FILTER_NONE) { - convert_argb_pixels(src_memory, src_pitch, 0, &src_size, srcformatdesc, - lockrect.pBits, lockrect.Pitch, 0, &dst_size, destformatdesc, color_key, src_palette); + convert_argb_pixels(tmp_src_memory, tmp_src_pitch, 0, &src_size, srcformatdesc, + tmp_dst_memory, tmp_dst_pitch, 0, &dst_size, destformatdesc, color_key, src_palette); } else /* if ((filter & 0xf) == D3DX_FILTER_POINT) */ { @@ -2019,12 +2088,29 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, /* Always apply a point filter until D3DX_FILTER_LINEAR, * D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */ - point_filter_argb_pixels(src_memory, src_pitch, 0, &src_size, srcformatdesc, - lockrect.pBits, lockrect.Pitch, 0, &dst_size, destformatdesc, color_key, src_palette); + point_filter_argb_pixels(tmp_src_memory, tmp_src_pitch, 0, &src_size, srcformatdesc, + tmp_dst_memory, tmp_dst_pitch, 0, &dst_size, destformatdesc, color_key, src_palette); + } + + /* handle post-conversion */ + if (post_convert) + { + if (!post_convert(tmp_dst_memory, lockrect.pBits, tmp_dst_pitch, lockrect.Pitch, + WINED3DFMT_B8G8R8A8_UNORM, dst_size.width, dst_size.height)) + { + hr = E_FAIL; + } } } - return unlock_surface(dst_surface, &lockrect, surface, TRUE); +done: + if (pre_convert) + HeapFree(GetProcessHeap(), 0, tmp_src_memory); + if (post_convert) + HeapFree(GetProcessHeap(), 0, tmp_dst_memory); + + unlock_surface(dst_surface, &lockrect, surface, TRUE); + return hr; } /************************************************************ diff --git a/modules/rostests/winetests/d3dx9_36/surface.c b/modules/rostests/winetests/d3dx9_36/surface.c index 2c83dc23499..95b64a0fa78 100644 --- a/modules/rostests/winetests/d3dx9_36/surface.c +++ b/modules/rostests/winetests/d3dx9_36/surface.c @@ -1224,7 +1224,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT3 format.\n"); + ok(SUCCEEDED(hr), "Failed to convert pixels to DXT3 format.\n"); check_release((IUnknown*)newsurf, 1); check_release((IUnknown*)tex, 0); } @@ -1250,7 +1250,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT5 format.\n"); + ok(SUCCEEDED(hr), "Failed to convert pixels to DXT5 format.\n"); check_release((IUnknown*)newsurf, 1); check_release((IUnknown*)tex, 0); } @@ -1263,10 +1263,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT1 format.\n"); + ok(SUCCEEDED(hr), "Failed to convert pixels to DXT1 format.\n"); hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); - todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels from DXT1 format.\n"); + ok(SUCCEEDED(hr), "Failed to convert pixels from DXT1 format.\n"); check_release((IUnknown*)newsurf, 1); check_release((IUnknown*)tex, 0); diff --git a/sdk/tools/winesync/d3dx9_staging/0014-d3dx9_36__add_DXTn_support.diff b/sdk/tools/winesync/d3dx9_staging/0014-d3dx9_36__add_DXTn_support.diff new file mode 100644 index 00000000000..96b30a5f056 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0014-d3dx9_36__add_DXTn_support.diff @@ -0,0 +1,203 @@ +diff --git a/dll/directx/wine/d3dx9_36/d3dx9.cmake b/dll/directx/wine/d3dx9_36/d3dx9.cmake +index 77dd1cde..900a8bfe 100644 +--- a/dll/directx/wine/d3dx9_36/d3dx9.cmake ++++ b/dll/directx/wine/d3dx9_36/d3dx9.cmake +@@ -35,7 +35,7 @@ function(add_d3dx9_target __version) + set_module_type(${module} win32dll) + add_dependencies(${module} d3d_idl_headers) + target_link_libraries(${module} dxguid wine) +- add_importlibs(${module} d3dcompiler_43 d3dxof user32 ole32 gdi32 msvcrt kernel32 ntdll) ++ add_importlibs(${module} d3dcompiler_43 d3dxof d3dwine user32 ole32 gdi32 msvcrt kernel32 ntdll) + add_delay_importlibs(${module} windowscodecs) + add_pch(${module} ../d3dx9_36/precomp.h SOURCE) + add_cd_file(TARGET ${module} DESTINATION reactos/system32 FOR all) +diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c +index d236feb0..3c308d36 100644 +--- a/dll/directx/wine/d3dx9_36/surface.c ++++ b/dll/directx/wine/d3dx9_36/surface.c +@@ -27,6 +27,8 @@ + #include "ole2.h" + #include "wincodec.h" + ++#include "wine/wined3d.h" ++ + WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + + HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT, IWICImagingFactory**); +@@ -1876,6 +1878,24 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic + } + } + ++typedef BOOL (*dxtn_conversion_func)(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, ++ enum wined3d_format_id format, unsigned int w, unsigned int h); ++ ++static dxtn_conversion_func get_dxtn_conversion_func(D3DFORMAT format, BOOL encode) ++{ ++ switch (format) ++ { ++ case D3DFMT_DXT1: ++ return encode ? wined3d_dxt1_encode : wined3d_dxt1_decode; ++ case D3DFMT_DXT3: ++ return encode ? wined3d_dxt3_encode : wined3d_dxt3_decode; ++ case D3DFMT_DXT5: ++ return encode ? wined3d_dxt5_encode : wined3d_dxt5_decode; ++ default: ++ return NULL; ++ } ++} ++ + /************************************************************ + * D3DXLoadSurfaceFromMemory + * +@@ -1915,10 +1935,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, + { + const struct pixel_format_desc *srcformatdesc, *destformatdesc; + IDirect3DSurface9 *surface; ++ void *tmp_src_memory = NULL, *tmp_dst_memory = NULL; ++ dxtn_conversion_func pre_convert = NULL, post_convert = NULL; + D3DSURFACE_DESC surfdesc; + D3DLOCKED_RECT lockrect; + struct volume src_size, dst_size; +- HRESULT hr; ++ HRESULT hr = D3D_OK; + + TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s, %#x, 0x%08x)\n", + dst_surface, dst_palette, wine_dbgstr_rect(dst_rect), src_memory, src_format, +@@ -1999,18 +2021,65 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, + } + else /* Stretching or format conversion. */ + { +- if (!is_conversion_from_supported(srcformatdesc) +- || !is_conversion_to_supported(destformatdesc)) ++ UINT tmp_src_pitch, tmp_dst_pitch; ++ ++ pre_convert = get_dxtn_conversion_func(srcformatdesc->format, FALSE); ++ post_convert = get_dxtn_conversion_func(destformatdesc->format, TRUE); ++ ++ if ((!pre_convert && !is_conversion_from_supported(srcformatdesc)) || ++ (!post_convert && !is_conversion_to_supported(destformatdesc))) + { + FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format); + unlock_surface(dst_surface, &lockrect, surface, FALSE); + return E_NOTIMPL; + } + ++ /* handle pre-conversion */ ++ if (pre_convert) ++ { ++ tmp_src_memory = HeapAlloc(GetProcessHeap(), 0, src_size.width * src_size.height * sizeof(DWORD)); ++ if (!tmp_src_memory) ++ { ++ hr = E_OUTOFMEMORY; ++ goto done; ++ } ++ tmp_src_pitch = src_size.width * sizeof(DWORD); ++ if (!pre_convert(src_memory, tmp_src_memory, src_pitch, tmp_src_pitch, ++ WINED3DFMT_B8G8R8A8_UNORM, src_size.width, src_size.height)) ++ { ++ hr = E_FAIL; ++ goto done; ++ } ++ srcformatdesc = get_format_info(D3DFMT_A8R8G8B8); ++ } ++ else ++ { ++ tmp_src_memory = (void *)src_memory; ++ tmp_src_pitch = src_pitch; ++ } ++ ++ /* handle post-conversion */ ++ if (post_convert) ++ { ++ tmp_dst_memory = HeapAlloc(GetProcessHeap(), 0, dst_size.width * dst_size.height * sizeof(DWORD)); ++ if (!tmp_dst_memory) ++ { ++ hr = E_OUTOFMEMORY; ++ goto done; ++ } ++ tmp_dst_pitch = dst_size.width * sizeof(DWORD); ++ destformatdesc = get_format_info(D3DFMT_A8R8G8B8); ++ } ++ else ++ { ++ tmp_dst_memory = lockrect.pBits; ++ tmp_dst_pitch = lockrect.Pitch; ++ } ++ + if ((filter & 0xf) == D3DX_FILTER_NONE) + { +- convert_argb_pixels(src_memory, src_pitch, 0, &src_size, srcformatdesc, +- lockrect.pBits, lockrect.Pitch, 0, &dst_size, destformatdesc, color_key, src_palette); ++ convert_argb_pixels(tmp_src_memory, tmp_src_pitch, 0, &src_size, srcformatdesc, ++ tmp_dst_memory, tmp_dst_pitch, 0, &dst_size, destformatdesc, color_key, src_palette); + } + else /* if ((filter & 0xf) == D3DX_FILTER_POINT) */ + { +@@ -2019,12 +2088,29 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, + + /* Always apply a point filter until D3DX_FILTER_LINEAR, + * D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */ +- point_filter_argb_pixels(src_memory, src_pitch, 0, &src_size, srcformatdesc, +- lockrect.pBits, lockrect.Pitch, 0, &dst_size, destformatdesc, color_key, src_palette); ++ point_filter_argb_pixels(tmp_src_memory, tmp_src_pitch, 0, &src_size, srcformatdesc, ++ tmp_dst_memory, tmp_dst_pitch, 0, &dst_size, destformatdesc, color_key, src_palette); ++ } ++ ++ /* handle post-conversion */ ++ if (post_convert) ++ { ++ if (!post_convert(tmp_dst_memory, lockrect.pBits, tmp_dst_pitch, lockrect.Pitch, ++ WINED3DFMT_B8G8R8A8_UNORM, dst_size.width, dst_size.height)) ++ { ++ hr = E_FAIL; ++ } + } + } + +- return unlock_surface(dst_surface, &lockrect, surface, TRUE); ++done: ++ if (pre_convert) ++ HeapFree(GetProcessHeap(), 0, tmp_src_memory); ++ if (post_convert) ++ HeapFree(GetProcessHeap(), 0, tmp_dst_memory); ++ ++ unlock_surface(dst_surface, &lockrect, surface, TRUE); ++ return hr; + } + + /************************************************************ +diff --git a/modules/rostests/winetests/d3dx9_36/surface.c b/modules/rostests/winetests/d3dx9_36/surface.c +index 2c83dc23..95b64a0f 100644 +--- a/modules/rostests/winetests/d3dx9_36/surface.c ++++ b/modules/rostests/winetests/d3dx9_36/surface.c +@@ -1224,7 +1224,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) + hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); + ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); +- todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT3 format.\n"); ++ ok(SUCCEEDED(hr), "Failed to convert pixels to DXT3 format.\n"); + check_release((IUnknown*)newsurf, 1); + check_release((IUnknown*)tex, 0); + } +@@ -1250,7 +1250,7 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) + hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); + ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); +- todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT5 format.\n"); ++ ok(SUCCEEDED(hr), "Failed to convert pixels to DXT5 format.\n"); + check_release((IUnknown*)newsurf, 1); + check_release((IUnknown*)tex, 0); + } +@@ -1263,10 +1263,10 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) + hr = IDirect3DTexture9_GetSurfaceLevel(tex, 0, &newsurf); + ok(SUCCEEDED(hr), "Failed to get the surface, hr %#x.\n", hr); + hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); +- todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels to DXT1 format.\n"); ++ ok(SUCCEEDED(hr), "Failed to convert pixels to DXT1 format.\n"); + + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); +- todo_wine ok(SUCCEEDED(hr), "Failed to convert pixels from DXT1 format.\n"); ++ ok(SUCCEEDED(hr), "Failed to convert pixels from DXT1 format.\n"); + + check_release((IUnknown*)newsurf, 1); + check_release((IUnknown*)tex, 0);

4 years, 10 months

[reactos] 29/74: [WINESYNC]d3dx9_36: Improve D3DXSaveTextureToFile to save simple texture to dds file.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fad6fb021d9d8fa5cb1ae… commit fad6fb021d9d8fa5cb1aef4f5a627a3e48d81976 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 02:09:33 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36: Improve D3DXSaveTextureToFile to save simple texture to dds file. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_36/d3dx9_private.h | 2 + dll/directx/wine/d3dx9_36/surface.c | 62 +++++++++++++ dll/directx/wine/d3dx9_36/texture.c | 5 +- ...eToFile_to_save_simple_texture_to_dds_file.diff | 102 +++++++++++++++++++++ 4 files changed, 167 insertions(+), 4 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/d3dx9_private.h b/dll/directx/wine/d3dx9_36/d3dx9_private.h index 1c1613024dc..5fc7f506760 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_private.h +++ b/dll/directx/wine/d3dx9_36/d3dx9_private.h @@ -125,6 +125,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, IDirect3DSurface9 **temp_surface, BOOL write) DECLSPEC_HIDDEN; HRESULT unlock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, IDirect3DSurface9 *temp_surface, BOOL update) DECLSPEC_HIDDEN; +HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture, + const PALETTEENTRY *src_palette) DECLSPEC_HIDDEN; unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN; float float_16_to_32(const unsigned short in) DECLSPEC_HIDDEN; diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c index 185d4f44c0d..d236feb0b83 100644 --- a/dll/directx/wine/d3dx9_36/surface.c +++ b/dll/directx/wine/d3dx9_36/surface.c @@ -612,6 +612,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur return D3D_OK; } +static HRESULT get_surface(D3DRESOURCETYPE type, struct IDirect3DBaseTexture9 *tex, + int face, UINT level, struct IDirect3DSurface9 **surf) +{ + switch (type) + { + case D3DRTYPE_TEXTURE: + return IDirect3DTexture9_GetSurfaceLevel((IDirect3DTexture9*) tex, level, surf); + case D3DRTYPE_CUBETEXTURE: + return IDirect3DCubeTexture9_GetCubeMapSurface((IDirect3DCubeTexture9*) tex, face, level, surf); + default: + ERR("Unexpected texture type\n"); + return E_NOTIMPL; + } +} + +HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture, const PALETTEENTRY *src_palette) +{ + HRESULT hr; + D3DRESOURCETYPE type; + UINT mip_levels; + IDirect3DSurface9 *surface; + + type = IDirect3DBaseTexture9_GetType(src_texture); + + if ((type != D3DRTYPE_TEXTURE) && (type != D3DRTYPE_CUBETEXTURE) && (type != D3DRTYPE_VOLUMETEXTURE)) + return D3DERR_INVALIDCALL; + + if (type == D3DRTYPE_CUBETEXTURE) + { + FIXME("Cube texture not supported yet\n"); + return E_NOTIMPL; + } + else if (type == D3DRTYPE_VOLUMETEXTURE) + { + FIXME("Volume texture not supported yet\n"); + return E_NOTIMPL; + } + + mip_levels = IDirect3DTexture9_GetLevelCount(src_texture); + + if (mip_levels > 1) + { + FIXME("Mipmap not supported yet\n"); + return E_NOTIMPL; + } + + if (src_palette) + { + FIXME("Saving surfaces with palettized pixel formats not implemented yet\n"); + return E_NOTIMPL; + } + + hr = get_surface(type, src_texture, D3DCUBEMAP_FACE_POSITIVE_X, 0, &surface); + + if (SUCCEEDED(hr)) + { + hr = save_dds_surface_to_memory(dst_buffer, surface, NULL); + IDirect3DSurface9_Release(surface); + } + + return hr; +} HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette, 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/dll/directx/wine/d3dx9_36/texture.c b/dll/directx/wine/d3dx9_36/texture.c index e2dfab84205..9f0e541cb61 100644 --- a/dll/directx/wine/d3dx9_36/texture.c +++ b/dll/directx/wine/d3dx9_36/texture.c @@ -1906,10 +1906,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE if (!dst_buffer || !src_texture) return D3DERR_INVALIDCALL; if (file_format == D3DXIFF_DDS) - { - FIXME("DDS file format isn't supported yet\n"); - return E_NOTIMPL; - } + return save_dds_texture_to_memory(dst_buffer, src_texture, src_palette); type = IDirect3DBaseTexture9_GetType(src_texture); switch (type) diff --git a/sdk/tools/winesync/d3dx9_staging/0013-d3dx9_36__Improve_D3DXSaveTextureToFile_to_save_simple_texture_to_dds_file.diff b/sdk/tools/winesync/d3dx9_staging/0013-d3dx9_36__Improve_D3DXSaveTextureToFile_to_save_simple_texture_to_dds_file.diff new file mode 100644 index 00000000000..f8a3bc77f8c --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0013-d3dx9_36__Improve_D3DXSaveTextureToFile_to_save_simple_texture_to_dds_file.diff @@ -0,0 +1,102 @@ +diff --git a/dll/directx/wine/d3dx9_36/d3dx9_private.h b/dll/directx/wine/d3dx9_36/d3dx9_private.h +index 5a28f2e..158aae3 100644 +--- a/dll/directx/wine/d3dx9_36/d3dx9_private.h ++++ b/dll/directx/wine/d3dx9_36/d3dx9_private.h +@@ -125,6 +125,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, + IDirect3DSurface9 **temp_surface, BOOL write) DECLSPEC_HIDDEN; + HRESULT unlock_surface(IDirect3DSurface9 *surface, D3DLOCKED_RECT *lock, + IDirect3DSurface9 *temp_surface, BOOL update) DECLSPEC_HIDDEN; ++HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture, ++ const PALETTEENTRY *src_palette) DECLSPEC_HIDDEN; + + unsigned short float_32_to_16(const float in) DECLSPEC_HIDDEN; + float float_16_to_32(const unsigned short in) DECLSPEC_HIDDEN; +diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c +index 185d4f4..d236feb 100644 +--- a/dll/directx/wine/d3dx9_36/surface.c ++++ b/dll/directx/wine/d3dx9_36/surface.c +@@ -612,6 +612,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur + return D3D_OK; + } + ++static HRESULT get_surface(D3DRESOURCETYPE type, struct IDirect3DBaseTexture9 *tex, ++ int face, UINT level, struct IDirect3DSurface9 **surf) ++{ ++ switch (type) ++ { ++ case D3DRTYPE_TEXTURE: ++ return IDirect3DTexture9_GetSurfaceLevel((IDirect3DTexture9*) tex, level, surf); ++ case D3DRTYPE_CUBETEXTURE: ++ return IDirect3DCubeTexture9_GetCubeMapSurface((IDirect3DCubeTexture9*) tex, face, level, surf); ++ default: ++ ERR("Unexpected texture type\n"); ++ return E_NOTIMPL; ++ } ++} ++ ++HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture, const PALETTEENTRY *src_palette) ++{ ++ HRESULT hr; ++ D3DRESOURCETYPE type; ++ UINT mip_levels; ++ IDirect3DSurface9 *surface; ++ ++ type = IDirect3DBaseTexture9_GetType(src_texture); ++ ++ if ((type != D3DRTYPE_TEXTURE) && (type != D3DRTYPE_CUBETEXTURE) && (type != D3DRTYPE_VOLUMETEXTURE)) ++ return D3DERR_INVALIDCALL; ++ ++ if (type == D3DRTYPE_CUBETEXTURE) ++ { ++ FIXME("Cube texture not supported yet\n"); ++ return E_NOTIMPL; ++ } ++ else if (type == D3DRTYPE_VOLUMETEXTURE) ++ { ++ FIXME("Volume texture not supported yet\n"); ++ return E_NOTIMPL; ++ } ++ ++ mip_levels = IDirect3DTexture9_GetLevelCount(src_texture); ++ ++ if (mip_levels > 1) ++ { ++ FIXME("Mipmap not supported yet\n"); ++ return E_NOTIMPL; ++ } ++ ++ if (src_palette) ++ { ++ FIXME("Saving surfaces with palettized pixel formats not implemented yet\n"); ++ return E_NOTIMPL; ++ } ++ ++ hr = get_surface(type, src_texture, D3DCUBEMAP_FACE_POSITIVE_X, 0, &surface); ++ ++ if (SUCCEEDED(hr)) ++ { ++ hr = save_dds_surface_to_memory(dst_buffer, surface, NULL); ++ IDirect3DSurface9_Release(surface); ++ } ++ ++ return hr; ++} + HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette, + 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/dll/directx/wine/d3dx9_36/texture.c b/dll/directx/wine/d3dx9_36/texture.c +index e2dfab8..9f0e541 100644 +--- a/dll/directx/wine/d3dx9_36/texture.c ++++ b/dll/directx/wine/d3dx9_36/texture.c +@@ -1906,10 +1906,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE + if (!dst_buffer || !src_texture) return D3DERR_INVALIDCALL; + + if (file_format == D3DXIFF_DDS) +- { +- FIXME("DDS file format isn't supported yet\n"); +- return E_NOTIMPL; +- } ++ return save_dds_texture_to_memory(dst_buffer, src_texture, src_palette); + + type = IDirect3DBaseTexture9_GetType(src_texture); + switch (type)

4 years, 10 months

[reactos] 28/74: [WINESYNC]d3dx9_36: Add support for FOURCC surface to save_dds_surface_to_memory.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea80aaf8ad7fbe12ac720… commit ea80aaf8ad7fbe12ac72018fc39a3fabf07c6437 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 02:09:33 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36: Add support for FOURCC surface to save_dds_surface_to_memory. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- 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 01729ea9a60..185d4f44c0d 100644 --- a/dll/directx/wine/d3dx9_36/surface.c +++ b/dll/directx/wine/d3dx9_36/surface.c @@ -395,6 +395,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/0012-d3dx9_36__Add_support_for_FOURCC_surface_to_save_dds_surface_to_memory.diff b/sdk/tools/winesync/d3dx9_staging/0012-d3dx9_36__Add_support_for_FOURCC_surface_to_save_dds_surface_to_memory.diff new file mode 100644 index 00000000000..b1a114bf1b1 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0012-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 01729ea..185d4f4 100644 +--- a/dll/directx/wine/d3dx9_36/surface.c ++++ b/dll/directx/wine/d3dx9_36/surface.c +@@ -395,6 +395,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; + }

4 years, 10 months

[reactos] 27/74: [WINESYNC]d3dx9: Implement D3DXComputeTangent

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=71c6a60ad4c14e4bd64a9… commit 71c6a60ad4c14e4bd64a9a58d5f6079a56f6f6eb Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 02:07:11 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9: Implement D3DXComputeTangent Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wine-staging patch by Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dll/directx/wine/d3dx9_24/d3dx9_24.spec | 2 +- dll/directx/wine/d3dx9_25/d3dx9_25.spec | 2 +- dll/directx/wine/d3dx9_26/d3dx9_26.spec | 2 +- dll/directx/wine/d3dx9_27/d3dx9_27.spec | 2 +- dll/directx/wine/d3dx9_28/d3dx9_28.spec | 2 +- dll/directx/wine/d3dx9_29/d3dx9_29.spec | 2 +- dll/directx/wine/d3dx9_30/d3dx9_30.spec | 2 +- dll/directx/wine/d3dx9_31/d3dx9_31.spec | 2 +- dll/directx/wine/d3dx9_32/d3dx9_32.spec | 2 +- dll/directx/wine/d3dx9_33/d3dx9_33.spec | 2 +- dll/directx/wine/d3dx9_34/d3dx9_34.spec | 2 +- dll/directx/wine/d3dx9_35/d3dx9_35.spec | 2 +- dll/directx/wine/d3dx9_36/d3dx9_36.spec | 2 +- dll/directx/wine/d3dx9_36/mesh.c | 18 ++ dll/directx/wine/d3dx9_37/d3dx9_37.spec | 2 +- dll/directx/wine/d3dx9_38/d3dx9_38.spec | 2 +- dll/directx/wine/d3dx9_39/d3dx9_39.spec | 2 +- dll/directx/wine/d3dx9_40/d3dx9_40.spec | 2 +- dll/directx/wine/d3dx9_41/d3dx9_41.spec | 2 +- dll/directx/wine/d3dx9_42/d3dx9_42.spec | 2 +- dll/directx/wine/d3dx9_43/d3dx9_43.spec | 2 +- .../0011-d3dx9__Implement_D3DXComputeTangent.diff | 289 +++++++++++++++++++++ 22 files changed, 327 insertions(+), 20 deletions(-) diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec b/dll/directx/wine/d3dx9_24/d3dx9_24.spec index ad3ea3a036e..3cf044c10e9 100644 --- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec +++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec @@ -20,7 +20,7 @@ @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec b/dll/directx/wine/d3dx9_25/d3dx9_25.spec index b54a8e16d10..f311bbf1e13 100644 --- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec +++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec @@ -20,7 +20,7 @@ @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec b/dll/directx/wine/d3dx9_26/d3dx9_26.spec index 03542f07aae..aa560e4ea9e 100644 --- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec +++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec b/dll/directx/wine/d3dx9_27/d3dx9_27.spec index 03542f07aae..aa560e4ea9e 100644 --- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec +++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec b/dll/directx/wine/d3dx9_28/d3dx9_28.spec index b470fb33606..fb57152b97b 100644 --- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec +++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec b/dll/directx/wine/d3dx9_29/d3dx9_29.spec index b470fb33606..fb57152b97b 100644 --- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec +++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/dll/directx/wine/d3dx9_30/d3dx9_30.spec index e90185a5b7d..129e2a049ce 100644 --- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec +++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec b/dll/directx/wine/d3dx9_31/d3dx9_31.spec index b926ad5e085..2e4456a41c3 100644 --- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec +++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec b/dll/directx/wine/d3dx9_32/d3dx9_32.spec index a4d698bd4de..d0d3631d98b 100644 --- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec +++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec b/dll/directx/wine/d3dx9_33/d3dx9_33.spec index a4d698bd4de..d0d3631d98b 100644 --- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec +++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec b/dll/directx/wine/d3dx9_34/d3dx9_34.spec index a4d698bd4de..d0d3631d98b 100644 --- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec +++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec b/dll/directx/wine/d3dx9_35/d3dx9_35.spec index a4d698bd4de..d0d3631d98b 100644 --- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec +++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec b/dll/directx/wine/d3dx9_36/d3dx9_36.spec index 3b5fdcc45dc..9ef3581b978 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec +++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c index a392a5b5c1b..2a9ee0627c0 100644 --- a/dll/directx/wine/d3dx9_36/mesh.c +++ b/dll/directx/wine/d3dx9_36/mesh.c @@ -7536,6 +7536,24 @@ done: return hr; } +/************************************************************************* + * D3DXComputeTangent (D3DX9_36.@) + */ +HRESULT WINAPI D3DXComputeTangent(ID3DXMesh *mesh, DWORD stage_idx, DWORD tangent_idx, + DWORD binorm_idx, DWORD wrap, const DWORD *adjacency) +{ + TRACE("mesh %p, stage_idx %d, tangent_idx %d, binorm_idx %d, wrap %d, adjacency %p.\n", + mesh, stage_idx, tangent_idx, binorm_idx, wrap, adjacency); + + return D3DXComputeTangentFrameEx( mesh, D3DDECLUSAGE_TEXCOORD, stage_idx, + ( binorm_idx == D3DX_DEFAULT ) ? D3DX_DEFAULT : D3DDECLUSAGE_BINORMAL, + binorm_idx, + ( tangent_idx == D3DX_DEFAULT ) ? D3DX_DEFAULT : D3DDECLUSAGE_TANGENT, + tangent_idx, D3DX_DEFAULT, 0, + ( wrap ? D3DXTANGENT_WRAP_UV : 0 ) | D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_ORTHOGONALIZE_FROM_U, + adjacency, -1.01f, -0.01f, -1.01f, NULL, NULL); +} + /************************************************************************* * D3DXComputeNormals (D3DX9_36.@) */ diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec b/dll/directx/wine/d3dx9_37/d3dx9_37.spec index 3b5fdcc45dc..9ef3581b978 100644 --- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec +++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec b/dll/directx/wine/d3dx9_38/d3dx9_38.spec index 3b5fdcc45dc..9ef3581b978 100644 --- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec +++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec b/dll/directx/wine/d3dx9_39/d3dx9_39.spec index 3b5fdcc45dc..9ef3581b978 100644 --- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec +++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec b/dll/directx/wine/d3dx9_40/d3dx9_40.spec index 3b5fdcc45dc..9ef3581b978 100644 --- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec +++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec b/dll/directx/wine/d3dx9_41/d3dx9_41.spec index 3b5fdcc45dc..9ef3581b978 100644 --- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec +++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec b/dll/directx/wine/d3dx9_42/d3dx9_42.spec index 3a681e3edfa..c1f0104d978 100644 --- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec +++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec b/dll/directx/wine/d3dx9_43/d3dx9_43.spec index 3a681e3edfa..c1f0104d978 100644 --- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec +++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec @@ -24,7 +24,7 @@ @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) -@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) +@ stdcall D3DXComputeTangent(ptr long long long long ptr) @ stdcall -stub D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) diff --git a/sdk/tools/winesync/d3dx9_staging/0011-d3dx9__Implement_D3DXComputeTangent.diff b/sdk/tools/winesync/d3dx9_staging/0011-d3dx9__Implement_D3DXComputeTangent.diff new file mode 100644 index 00000000000..2849edc8155 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0011-d3dx9__Implement_D3DXComputeTangent.diff @@ -0,0 +1,289 @@ +diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec b/dll/directx/wine/d3dx9_24/d3dx9_24.spec +index ad3ea3a0..3cf044c1 100644 +--- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec ++++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec +@@ -20,7 +20,7 @@ + @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec b/dll/directx/wine/d3dx9_25/d3dx9_25.spec +index b54a8e16..f311bbf1 100644 +--- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec ++++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec +@@ -20,7 +20,7 @@ + @ stdcall D3DXComputeBoundingSphere(ptr long long ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec b/dll/directx/wine/d3dx9_26/d3dx9_26.spec +index 03542f07..aa560e4e 100644 +--- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec ++++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec b/dll/directx/wine/d3dx9_27/d3dx9_27.spec +index 03542f07..aa560e4e 100644 +--- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec ++++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec b/dll/directx/wine/d3dx9_28/d3dx9_28.spec +index b470fb33..fb57152b 100644 +--- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec ++++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec b/dll/directx/wine/d3dx9_29/d3dx9_29.spec +index b470fb33..fb57152b 100644 +--- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec ++++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/dll/directx/wine/d3dx9_30/d3dx9_30.spec +index e90185a5..129e2a04 100644 +--- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec ++++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec b/dll/directx/wine/d3dx9_31/d3dx9_31.spec +index b926ad5e..2e4456a4 100644 +--- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec ++++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec b/dll/directx/wine/d3dx9_32/d3dx9_32.spec +index a4d698bd..d0d3631d 100644 +--- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec ++++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec b/dll/directx/wine/d3dx9_33/d3dx9_33.spec +index a4d698bd..d0d3631d 100644 +--- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec ++++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec b/dll/directx/wine/d3dx9_34/d3dx9_34.spec +index a4d698bd..d0d3631d 100644 +--- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec ++++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec b/dll/directx/wine/d3dx9_35/d3dx9_35.spec +index a4d698bd..d0d3631d 100644 +--- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec ++++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec b/dll/directx/wine/d3dx9_36/d3dx9_36.spec +index 3b5fdcc4..9ef3581b 100644 +--- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec ++++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c +index a392a5b5..2a9ee062 100644 +--- a/dll/directx/wine/d3dx9_36/mesh.c ++++ b/dll/directx/wine/d3dx9_36/mesh.c +@@ -7536,6 +7536,24 @@ done: + return hr; + } + ++/************************************************************************* ++ * D3DXComputeTangent (D3DX9_36.@) ++ */ ++HRESULT WINAPI D3DXComputeTangent(ID3DXMesh *mesh, DWORD stage_idx, DWORD tangent_idx, ++ DWORD binorm_idx, DWORD wrap, const DWORD *adjacency) ++{ ++ TRACE("mesh %p, stage_idx %d, tangent_idx %d, binorm_idx %d, wrap %d, adjacency %p.\n", ++ mesh, stage_idx, tangent_idx, binorm_idx, wrap, adjacency); ++ ++ return D3DXComputeTangentFrameEx( mesh, D3DDECLUSAGE_TEXCOORD, stage_idx, ++ ( binorm_idx == D3DX_DEFAULT ) ? D3DX_DEFAULT : D3DDECLUSAGE_BINORMAL, ++ binorm_idx, ++ ( tangent_idx == D3DX_DEFAULT ) ? D3DX_DEFAULT : D3DDECLUSAGE_TANGENT, ++ tangent_idx, D3DX_DEFAULT, 0, ++ ( wrap ? D3DXTANGENT_WRAP_UV : 0 ) | D3DXTANGENT_GENERATE_IN_PLACE | D3DXTANGENT_ORTHOGONALIZE_FROM_U, ++ adjacency, -1.01f, -0.01f, -1.01f, NULL, NULL); ++} ++ + /************************************************************************* + * D3DXComputeNormals (D3DX9_36.@) + */ +diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec b/dll/directx/wine/d3dx9_37/d3dx9_37.spec +index 3b5fdcc4..9ef3581b 100644 +--- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec ++++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec b/dll/directx/wine/d3dx9_38/d3dx9_38.spec +index 3b5fdcc4..9ef3581b 100644 +--- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec ++++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec b/dll/directx/wine/d3dx9_39/d3dx9_39.spec +index 3b5fdcc4..9ef3581b 100644 +--- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec ++++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec b/dll/directx/wine/d3dx9_40/d3dx9_40.spec +index 3b5fdcc4..9ef3581b 100644 +--- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec ++++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec b/dll/directx/wine/d3dx9_41/d3dx9_41.spec +index 3b5fdcc4..9ef3581b 100644 +--- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec ++++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec b/dll/directx/wine/d3dx9_42/d3dx9_42.spec +index 3a681e3e..c1f0104d 100644 +--- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec ++++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec b/dll/directx/wine/d3dx9_43/d3dx9_43.spec +index 3a681e3e..c1f0104d 100644 +--- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec ++++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec +@@ -24,7 +24,7 @@ + @ stdcall -stub D3DXComputeIMTFromTexture(ptr ptr long long ptr ptr ptr) + @ stdcall D3DXComputeNormalMap(ptr ptr ptr long long float) + @ stdcall D3DXComputeNormals(ptr ptr) +-@ stdcall -stub D3DXComputeTangent(ptr long long long long ptr) ++@ stdcall D3DXComputeTangent(ptr long long long long ptr) + @ stdcall -stub D3DXComputeTangentFrame(ptr long) + @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) + @ stdcall -stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr)

4 years, 10 months

[reactos] 26/74: [WINESYNC]d3dx9_*: Add D3DXSHProjectCubeMap stub

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98cd28be0d5771884db32… commit 98cd28be0d5771884db3212be93709e42c793fdc Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 01:56:18 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_*: Add D3DXSHProjectCubeMap stub Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46284 wine-staging patch by Andrey Gusev <andrey.goosev(a)gmail.com> --- dll/directx/wine/d3dx9_24/d3dx9_24.spec | 2 +- dll/directx/wine/d3dx9_25/d3dx9_25.spec | 2 +- dll/directx/wine/d3dx9_26/d3dx9_26.spec | 2 +- dll/directx/wine/d3dx9_27/d3dx9_27.spec | 2 +- dll/directx/wine/d3dx9_28/d3dx9_28.spec | 2 +- dll/directx/wine/d3dx9_29/d3dx9_29.spec | 2 +- dll/directx/wine/d3dx9_30/d3dx9_30.spec | 2 +- dll/directx/wine/d3dx9_31/d3dx9_31.spec | 2 +- dll/directx/wine/d3dx9_32/d3dx9_32.spec | 2 +- dll/directx/wine/d3dx9_33/d3dx9_33.spec | 2 +- dll/directx/wine/d3dx9_34/d3dx9_34.spec | 2 +- dll/directx/wine/d3dx9_35/d3dx9_35.spec | 2 +- dll/directx/wine/d3dx9_36/d3dx9_36.spec | 2 +- dll/directx/wine/d3dx9_36/math.c | 14 + dll/directx/wine/d3dx9_37/d3dx9_37.spec | 2 +- dll/directx/wine/d3dx9_38/d3dx9_38.spec | 2 +- dll/directx/wine/d3dx9_39/d3dx9_39.spec | 2 +- dll/directx/wine/d3dx9_40/d3dx9_40.spec | 2 +- dll/directx/wine/d3dx9_41/d3dx9_41.spec | 2 +- dll/directx/wine/d3dx9_42/d3dx9_42.spec | 2 +- dll/directx/wine/d3dx9_43/d3dx9_43.spec | 2 +- sdk/include/dxsdk/d3dx9math.h | 1 + ...010-d3dx9____Add_D3DXSHProjectCubeMap_stub.diff | 297 +++++++++++++++++++++ 23 files changed, 332 insertions(+), 20 deletions(-) diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec b/dll/directx/wine/d3dx9_24/d3dx9_24.spec index b7d81740428..ad3ea3a036e 100644 --- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec +++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec @@ -256,7 +256,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec b/dll/directx/wine/d3dx9_25/d3dx9_25.spec index 9a86cb84754..b54a8e16d10 100644 --- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec +++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec @@ -256,7 +256,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec b/dll/directx/wine/d3dx9_26/d3dx9_26.spec index 85d2c3408b3..03542f07aae 100644 --- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec +++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec @@ -260,7 +260,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec b/dll/directx/wine/d3dx9_27/d3dx9_27.spec index 85d2c3408b3..03542f07aae 100644 --- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec +++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec @@ -260,7 +260,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec b/dll/directx/wine/d3dx9_28/d3dx9_28.spec index 95b6bc510f1..b470fb33606 100644 --- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec +++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec @@ -265,7 +265,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec b/dll/directx/wine/d3dx9_29/d3dx9_29.spec index 95b6bc510f1..b470fb33606 100644 --- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec +++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec @@ -265,7 +265,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/dll/directx/wine/d3dx9_30/d3dx9_30.spec index ed6cb55e75b..e90185a5b7d 100644 --- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec +++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec @@ -265,7 +265,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec b/dll/directx/wine/d3dx9_31/d3dx9_31.spec index ecd12b659d4..b926ad5e085 100644 --- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec +++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec @@ -262,7 +262,7 @@ @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec b/dll/directx/wine/d3dx9_32/d3dx9_32.spec index 3e5fb3f301f..a4d698bd4de 100644 --- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec +++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec @@ -267,7 +267,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec b/dll/directx/wine/d3dx9_33/d3dx9_33.spec index 3e5fb3f301f..a4d698bd4de 100644 --- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec +++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec @@ -267,7 +267,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec b/dll/directx/wine/d3dx9_34/d3dx9_34.spec index 3e5fb3f301f..a4d698bd4de 100644 --- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec +++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec @@ -267,7 +267,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec b/dll/directx/wine/d3dx9_35/d3dx9_35.spec index 3e5fb3f301f..a4d698bd4de 100644 --- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec +++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec @@ -267,7 +267,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec b/dll/directx/wine/d3dx9_36/d3dx9_36.spec index 544b744b2b8..3b5fdcc45dc 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec +++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec @@ -269,7 +269,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_36/math.c b/dll/directx/wine/d3dx9_36/math.c index 08e51b765e7..976610c15e9 100644 --- a/dll/directx/wine/d3dx9_36/math.c +++ b/dll/directx/wine/d3dx9_36/math.c @@ -2969,6 +2969,20 @@ static void rotate_X(FLOAT *out, UINT order, FLOAT a, FLOAT *in) out[35] = 0.9057110548f * in[31] - 0.4192627370f * in[33] + 0.0624999329f * in[35]; } +HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout) +{ + FIXME("order %u, cubemap %p, rout %p, gout %p, bout %p: stub!\n", order, cubemap, rout, gout, bout); + + if(!cubemap || order < D3DXSH_MINORDER || order > D3DXSH_MAXORDER) + return D3DERR_INVALIDCALL; + + *rout = 0.0f; + *gout = 0.0f; + *bout = 0.0f; + + return D3D_OK; +} + FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in) { FLOAT alpha, beta, gamma, sinb, temp[36], temp1[36]; diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec b/dll/directx/wine/d3dx9_37/d3dx9_37.spec index 544b744b2b8..3b5fdcc45dc 100644 --- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec +++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec @@ -269,7 +269,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec b/dll/directx/wine/d3dx9_38/d3dx9_38.spec index 544b744b2b8..3b5fdcc45dc 100644 --- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec +++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec @@ -269,7 +269,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec b/dll/directx/wine/d3dx9_39/d3dx9_39.spec index 544b744b2b8..3b5fdcc45dc 100644 --- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec +++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec @@ -269,7 +269,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec b/dll/directx/wine/d3dx9_40/d3dx9_40.spec index 544b744b2b8..3b5fdcc45dc 100644 --- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec +++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec @@ -269,7 +269,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec b/dll/directx/wine/d3dx9_41/d3dx9_41.spec index 544b744b2b8..3b5fdcc45dc 100644 --- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec +++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec @@ -269,7 +269,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec b/dll/directx/wine/d3dx9_42/d3dx9_42.spec index f4e70364e9b..3a681e3edfa 100644 --- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec +++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec @@ -262,7 +262,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec b/dll/directx/wine/d3dx9_43/d3dx9_43.spec index f4e70364e9b..3a681e3edfa 100644 --- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec +++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec @@ -262,7 +262,7 @@ @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) -@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) +@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) @ stdcall D3DXSHRotate(ptr long ptr ptr) @ stdcall D3DXSHRotateZ(ptr long float ptr) @ stdcall D3DXSHScale(ptr long ptr float) diff --git a/sdk/include/dxsdk/d3dx9math.h b/sdk/include/dxsdk/d3dx9math.h index 2c41b73d423..7aed21e3ee3 100644 --- a/sdk/include/dxsdk/d3dx9math.h +++ b/sdk/include/dxsdk/d3dx9math.h @@ -396,6 +396,7 @@ HRESULT WINAPI D3DXSHEvalSphericalLight(UINT order, const D3DXVECTOR3 *dir, FLOA FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, const FLOAT *a, const FLOAT *b); FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b); FLOAT* WINAPI D3DXSHMultiply4(FLOAT *out, const FLOAT *a, const FLOAT *b); +HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout); FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in); FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, const FLOAT *in); FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, const FLOAT *a, const FLOAT scale); diff --git a/sdk/tools/winesync/d3dx9_staging/0010-d3dx9____Add_D3DXSHProjectCubeMap_stub.diff b/sdk/tools/winesync/d3dx9_staging/0010-d3dx9____Add_D3DXSHProjectCubeMap_stub.diff new file mode 100644 index 00000000000..322d9f16dff --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0010-d3dx9____Add_D3DXSHProjectCubeMap_stub.diff @@ -0,0 +1,297 @@ +diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec b/dll/directx/wine/d3dx9_24/d3dx9_24.spec +index b7d81740..ad3ea3a0 100644 +--- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec ++++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec +@@ -256,7 +256,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec b/dll/directx/wine/d3dx9_25/d3dx9_25.spec +index 9a86cb84..b54a8e16 100644 +--- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec ++++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec +@@ -256,7 +256,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec b/dll/directx/wine/d3dx9_26/d3dx9_26.spec +index 85d2c340..03542f07 100644 +--- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec ++++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec +@@ -260,7 +260,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec b/dll/directx/wine/d3dx9_27/d3dx9_27.spec +index 85d2c340..03542f07 100644 +--- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec ++++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec +@@ -260,7 +260,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec b/dll/directx/wine/d3dx9_28/d3dx9_28.spec +index 95b6bc51..b470fb33 100644 +--- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec ++++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec +@@ -265,7 +265,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec b/dll/directx/wine/d3dx9_29/d3dx9_29.spec +index 95b6bc51..b470fb33 100644 +--- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec ++++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec +@@ -265,7 +265,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/dll/directx/wine/d3dx9_30/d3dx9_30.spec +index ed6cb55e..e90185a5 100644 +--- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec ++++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec +@@ -265,7 +265,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec b/dll/directx/wine/d3dx9_31/d3dx9_31.spec +index ecd12b65..b926ad5e 100644 +--- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec ++++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec +@@ -262,7 +262,7 @@ + @ stdcall D3DXSHEvalSphericalLight(long ptr float float float float ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec b/dll/directx/wine/d3dx9_32/d3dx9_32.spec +index 3e5fb3f3..a4d698bd 100644 +--- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec ++++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec +@@ -267,7 +267,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec b/dll/directx/wine/d3dx9_33/d3dx9_33.spec +index 3e5fb3f3..a4d698bd 100644 +--- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec ++++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec +@@ -267,7 +267,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec b/dll/directx/wine/d3dx9_34/d3dx9_34.spec +index 3e5fb3f3..a4d698bd 100644 +--- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec ++++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec +@@ -267,7 +267,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec b/dll/directx/wine/d3dx9_35/d3dx9_35.spec +index 3e5fb3f3..a4d698bd 100644 +--- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec ++++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec +@@ -267,7 +267,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec b/dll/directx/wine/d3dx9_36/d3dx9_36.spec +index 544b744b..3b5fdcc4 100644 +--- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec ++++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec +@@ -269,7 +269,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_36/math.c b/dll/directx/wine/d3dx9_36/math.c +index 08e51b76..976610c1 100644 +--- a/dll/directx/wine/d3dx9_36/math.c ++++ b/dll/directx/wine/d3dx9_36/math.c +@@ -2969,6 +2969,20 @@ static void rotate_X(FLOAT *out, UINT order, FLOAT a, FLOAT *in) + out[35] = 0.9057110548f * in[31] - 0.4192627370f * in[33] + 0.0624999329f * in[35]; + } + ++HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout) ++{ ++ FIXME("order %u, cubemap %p, rout %p, gout %p, bout %p: stub!\n", order, cubemap, rout, gout, bout); ++ ++ if(!cubemap || order < D3DXSH_MINORDER || order > D3DXSH_MAXORDER) ++ return D3DERR_INVALIDCALL; ++ ++ *rout = 0.0f; ++ *gout = 0.0f; ++ *bout = 0.0f; ++ ++ return D3D_OK; ++} ++ + FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in) + { + FLOAT alpha, beta, gamma, sinb, temp[36], temp1[36]; +diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec b/dll/directx/wine/d3dx9_37/d3dx9_37.spec +index 544b744b..3b5fdcc4 100644 +--- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec ++++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec +@@ -269,7 +269,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec b/dll/directx/wine/d3dx9_38/d3dx9_38.spec +index 544b744b..3b5fdcc4 100644 +--- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec ++++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec +@@ -269,7 +269,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec b/dll/directx/wine/d3dx9_39/d3dx9_39.spec +index 544b744b..3b5fdcc4 100644 +--- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec ++++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec +@@ -269,7 +269,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec b/dll/directx/wine/d3dx9_40/d3dx9_40.spec +index 544b744b..3b5fdcc4 100644 +--- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec ++++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec +@@ -269,7 +269,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec b/dll/directx/wine/d3dx9_41/d3dx9_41.spec +index 544b744b..3b5fdcc4 100644 +--- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec ++++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec +@@ -269,7 +269,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec b/dll/directx/wine/d3dx9_42/d3dx9_42.spec +index f4e70364..3a681e3e 100644 +--- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec ++++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec +@@ -262,7 +262,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec b/dll/directx/wine/d3dx9_43/d3dx9_43.spec +index f4e70364..3a681e3e 100644 +--- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec ++++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec +@@ -262,7 +262,7 @@ + @ stdcall -stub D3DXSHMultiply6(ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSplitMeshSC(ptr long long ptr long ptr long long ptr ptr long ptr ptr ptr ptr ptr) + @ stdcall -stub D3DXSHPRTCompSuperCluster(ptr ptr long long ptr ptr) +-@ stdcall -stub D3DXSHProjectCubeMap(long ptr ptr ptr ptr) ++@ stdcall D3DXSHProjectCubeMap(long ptr ptr ptr ptr) + @ stdcall D3DXSHRotate(ptr long ptr ptr) + @ stdcall D3DXSHRotateZ(ptr long float ptr) + @ stdcall D3DXSHScale(ptr long ptr float) +diff --git a/sdk/include/dxsdk/d3dx9math.h b/sdk/include/dxsdk/d3dx9math.h +index 2c41b73d..7aed21e3 100644 +--- a/sdk/include/dxsdk/d3dx9math.h ++++ b/sdk/include/dxsdk/d3dx9math.h +@@ -396,6 +396,7 @@ HRESULT WINAPI D3DXSHEvalSphericalLight(UINT order, const D3DXVECTOR3 *dir, FLOA + FLOAT* WINAPI D3DXSHMultiply2(FLOAT *out, const FLOAT *a, const FLOAT *b); + FLOAT* WINAPI D3DXSHMultiply3(FLOAT *out, const FLOAT *a, const FLOAT *b); + FLOAT* WINAPI D3DXSHMultiply4(FLOAT *out, const FLOAT *a, const FLOAT *b); ++HRESULT WINAPI D3DXSHProjectCubeMap(UINT order, IDirect3DCubeTexture9 *cubemap, FLOAT *rout, FLOAT *gout, FLOAT *bout); + FLOAT* WINAPI D3DXSHRotate(FLOAT *out, UINT order, const D3DXMATRIX *matrix, const FLOAT *in); + FLOAT* WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, const FLOAT *in); + FLOAT* WINAPI D3DXSHScale(FLOAT *out, UINT order, const FLOAT *a, const FLOAT scale);

4 years, 10 months

[reactos] 25/74: [WINESYNC]d3dx9_36: Add semi-stub for D3DXOptimizeVertices.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24b51d5a07e0f7de009e4… commit 24b51d5a07e0f7de009e420efb4ca0b738027bf8 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 01:49:33 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36: Add semi-stub for D3DXOptimizeVertices. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- dll/directx/wine/d3dx9_24/d3dx9_24.spec | 2 +- dll/directx/wine/d3dx9_25/d3dx9_25.spec | 2 +- dll/directx/wine/d3dx9_26/d3dx9_26.spec | 2 +- dll/directx/wine/d3dx9_27/d3dx9_27.spec | 2 +- dll/directx/wine/d3dx9_28/d3dx9_28.spec | 2 +- dll/directx/wine/d3dx9_29/d3dx9_29.spec | 2 +- dll/directx/wine/d3dx9_30/d3dx9_30.spec | 2 +- dll/directx/wine/d3dx9_31/d3dx9_31.spec | 2 +- dll/directx/wine/d3dx9_32/d3dx9_32.spec | 2 +- dll/directx/wine/d3dx9_33/d3dx9_33.spec | 2 +- dll/directx/wine/d3dx9_34/d3dx9_34.spec | 2 +- dll/directx/wine/d3dx9_35/d3dx9_35.spec | 2 +- dll/directx/wine/d3dx9_36/d3dx9_36.spec | 2 +- dll/directx/wine/d3dx9_36/mesh.c | 27 ++ dll/directx/wine/d3dx9_37/d3dx9_37.spec | 2 +- dll/directx/wine/d3dx9_38/d3dx9_38.spec | 2 +- dll/directx/wine/d3dx9_39/d3dx9_39.spec | 2 +- dll/directx/wine/d3dx9_40/d3dx9_40.spec | 2 +- dll/directx/wine/d3dx9_41/d3dx9_41.spec | 2 +- dll/directx/wine/d3dx9_42/d3dx9_42.spec | 2 +- dll/directx/wine/d3dx9_43/d3dx9_43.spec | 2 +- modules/rostests/winetests/d3dx9_36/mesh.c | 22 ++ ...36__Add_semi-stub_for_D3DXOptimizeVertices.diff | 338 +++++++++++++++++++++ 23 files changed, 407 insertions(+), 20 deletions(-) diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec b/dll/directx/wine/d3dx9_24/d3dx9_24.spec index d4e741884b9..b7d81740428 100644 --- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec +++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec @@ -226,7 +226,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec b/dll/directx/wine/d3dx9_25/d3dx9_25.spec index 5375c07690a..9a86cb84754 100644 --- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec +++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec @@ -226,7 +226,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec b/dll/directx/wine/d3dx9_26/d3dx9_26.spec index c17f97f04a9..85d2c3408b3 100644 --- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec +++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec @@ -230,7 +230,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec b/dll/directx/wine/d3dx9_27/d3dx9_27.spec index c17f97f04a9..85d2c3408b3 100644 --- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec +++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec @@ -230,7 +230,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec b/dll/directx/wine/d3dx9_28/d3dx9_28.spec index 5b267c14599..95b6bc510f1 100644 --- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec +++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec @@ -230,7 +230,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec b/dll/directx/wine/d3dx9_29/d3dx9_29.spec index 5b267c14599..95b6bc510f1 100644 --- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec +++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec @@ -230,7 +230,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/dll/directx/wine/d3dx9_30/d3dx9_30.spec index dc9ea939416..ed6cb55e75b 100644 --- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec +++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec @@ -230,7 +230,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec b/dll/directx/wine/d3dx9_31/d3dx9_31.spec index 4dec8f58d0d..ecd12b659d4 100644 --- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec +++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec @@ -227,7 +227,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec b/dll/directx/wine/d3dx9_32/d3dx9_32.spec index 7b6d62df3e7..3e5fb3f301f 100644 --- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec +++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec @@ -227,7 +227,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec b/dll/directx/wine/d3dx9_33/d3dx9_33.spec index 7b6d62df3e7..3e5fb3f301f 100644 --- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec +++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec @@ -227,7 +227,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec b/dll/directx/wine/d3dx9_34/d3dx9_34.spec index 7b6d62df3e7..3e5fb3f301f 100644 --- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec +++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec @@ -227,7 +227,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec b/dll/directx/wine/d3dx9_35/d3dx9_35.spec index 7b6d62df3e7..3e5fb3f301f 100644 --- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec +++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec @@ -227,7 +227,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec b/dll/directx/wine/d3dx9_36/d3dx9_36.spec index 692321d9065..544b744b2b8 100644 --- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec +++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c index acbb2477670..a392a5b5c1b 100644 --- a/dll/directx/wine/d3dx9_36/mesh.c +++ b/dll/directx/wine/d3dx9_36/mesh.c @@ -7186,6 +7186,33 @@ cleanup: return hr; } + +/************************************************************************* + * D3DXOptimizeVertices (D3DX9_36.@) + */ +HRESULT WINAPI D3DXOptimizeVertices(const void *indices, UINT num_faces, + UINT num_vertices, BOOL indices_are_32bit, DWORD *vertex_remap) +{ + UINT i; + + FIXME("indices %p, num_faces %u, num_vertices %u, indices_are_32bit %#x, vertex_remap %p semi-stub.\n", + indices, num_faces, num_vertices, indices_are_32bit, vertex_remap); + + if (!vertex_remap) + { + WARN("vertex remap pointer is NULL.\n"); + return D3DERR_INVALIDCALL; + } + + for (i = 0; i < num_vertices; i++) + { + vertex_remap[i] = i; + } + + return D3D_OK; +} + + /************************************************************************* * D3DXOptimizeFaces (D3DX9_36.@) * diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec b/dll/directx/wine/d3dx9_37/d3dx9_37.spec index 692321d9065..544b744b2b8 100644 --- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec +++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec b/dll/directx/wine/d3dx9_38/d3dx9_38.spec index 692321d9065..544b744b2b8 100644 --- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec +++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec b/dll/directx/wine/d3dx9_39/d3dx9_39.spec index 692321d9065..544b744b2b8 100644 --- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec +++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec b/dll/directx/wine/d3dx9_40/d3dx9_40.spec index 692321d9065..544b744b2b8 100644 --- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec +++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec b/dll/directx/wine/d3dx9_41/d3dx9_41.spec index 692321d9065..544b744b2b8 100644 --- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec +++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec @@ -229,7 +229,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec b/dll/directx/wine/d3dx9_42/d3dx9_42.spec index 936ae902dea..f4e70364e9b 100644 --- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec +++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec @@ -222,7 +222,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec b/dll/directx/wine/d3dx9_43/d3dx9_43.spec index 936ae902dea..f4e70364e9b 100644 --- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec +++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec @@ -222,7 +222,7 @@ @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) @ stdcall D3DXOptimizeFaces(ptr long long long ptr) -@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) +@ stdcall D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c index 19e8b8e334e..176f06c56cd 100644 --- a/modules/rostests/winetests/d3dx9_36/mesh.c +++ b/modules/rostests/winetests/d3dx9_36/mesh.c @@ -10362,6 +10362,27 @@ cleanup: free_test_context(test_context); } +static void test_optimize_vertices(void) +{ + HRESULT hr; + DWORD vertex_remap[3]; + const DWORD indices[] = {0, 1, 2}; + const UINT num_faces = 1; + const UINT num_vertices = 3; + + hr = D3DXOptimizeVertices(indices, num_faces, + num_vertices, FALSE, + vertex_remap); + ok(hr == D3D_OK, "D3DXOptimizeVertices failed. Got %x, expected D3D_OK.\n", hr); + + /* vertex_remap must not be NULL */ + hr = D3DXOptimizeVertices(indices, num_faces, + num_vertices, FALSE, + NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeVertices passed NULL vertex_remap " + "pointer. Got %x, expected D3DERR_INVALIDCALL.\n", hr); +} + static void test_optimize_faces(void) { HRESULT hr; @@ -11250,6 +11271,7 @@ START_TEST(mesh) test_weld_vertices(); test_clone_mesh(); test_valid_mesh(); + test_optimize_vertices(); test_optimize_faces(); test_compute_normals(); test_D3DXFrameFind(); diff --git a/sdk/tools/winesync/d3dx9_staging/0009-d3dx9_36__Add_semi-stub_for_D3DXOptimizeVertices.diff b/sdk/tools/winesync/d3dx9_staging/0009-d3dx9_36__Add_semi-stub_for_D3DXOptimizeVertices.diff new file mode 100644 index 00000000000..28ad91ab339 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0009-d3dx9_36__Add_semi-stub_for_D3DXOptimizeVertices.diff @@ -0,0 +1,338 @@ +diff --git a/dll/directx/wine/d3dx9_24/d3dx9_24.spec b/dll/directx/wine/d3dx9_24/d3dx9_24.spec +index d4e74188..b7d81740 100644 +--- a/dll/directx/wine/d3dx9_24/d3dx9_24.spec ++++ b/dll/directx/wine/d3dx9_24/d3dx9_24.spec +@@ -226,7 +226,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_25/d3dx9_25.spec b/dll/directx/wine/d3dx9_25/d3dx9_25.spec +index 5375c076..9a86cb84 100644 +--- a/dll/directx/wine/d3dx9_25/d3dx9_25.spec ++++ b/dll/directx/wine/d3dx9_25/d3dx9_25.spec +@@ -226,7 +226,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_26/d3dx9_26.spec b/dll/directx/wine/d3dx9_26/d3dx9_26.spec +index c17f97f0..85d2c340 100644 +--- a/dll/directx/wine/d3dx9_26/d3dx9_26.spec ++++ b/dll/directx/wine/d3dx9_26/d3dx9_26.spec +@@ -230,7 +230,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_27/d3dx9_27.spec b/dll/directx/wine/d3dx9_27/d3dx9_27.spec +index c17f97f0..85d2c340 100644 +--- a/dll/directx/wine/d3dx9_27/d3dx9_27.spec ++++ b/dll/directx/wine/d3dx9_27/d3dx9_27.spec +@@ -230,7 +230,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_28/d3dx9_28.spec b/dll/directx/wine/d3dx9_28/d3dx9_28.spec +index 5b267c14..95b6bc51 100644 +--- a/dll/directx/wine/d3dx9_28/d3dx9_28.spec ++++ b/dll/directx/wine/d3dx9_28/d3dx9_28.spec +@@ -230,7 +230,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_29/d3dx9_29.spec b/dll/directx/wine/d3dx9_29/d3dx9_29.spec +index 5b267c14..95b6bc51 100644 +--- a/dll/directx/wine/d3dx9_29/d3dx9_29.spec ++++ b/dll/directx/wine/d3dx9_29/d3dx9_29.spec +@@ -230,7 +230,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_30/d3dx9_30.spec b/dll/directx/wine/d3dx9_30/d3dx9_30.spec +index dc9ea939..ed6cb55e 100644 +--- a/dll/directx/wine/d3dx9_30/d3dx9_30.spec ++++ b/dll/directx/wine/d3dx9_30/d3dx9_30.spec +@@ -230,7 +230,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_31/d3dx9_31.spec b/dll/directx/wine/d3dx9_31/d3dx9_31.spec +index 4dec8f58..ecd12b65 100644 +--- a/dll/directx/wine/d3dx9_31/d3dx9_31.spec ++++ b/dll/directx/wine/d3dx9_31/d3dx9_31.spec +@@ -227,7 +227,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_32/d3dx9_32.spec b/dll/directx/wine/d3dx9_32/d3dx9_32.spec +index 7b6d62df..3e5fb3f3 100644 +--- a/dll/directx/wine/d3dx9_32/d3dx9_32.spec ++++ b/dll/directx/wine/d3dx9_32/d3dx9_32.spec +@@ -227,7 +227,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_33/d3dx9_33.spec b/dll/directx/wine/d3dx9_33/d3dx9_33.spec +index 7b6d62df..3e5fb3f3 100644 +--- a/dll/directx/wine/d3dx9_33/d3dx9_33.spec ++++ b/dll/directx/wine/d3dx9_33/d3dx9_33.spec +@@ -227,7 +227,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_34/d3dx9_34.spec b/dll/directx/wine/d3dx9_34/d3dx9_34.spec +index 7b6d62df..3e5fb3f3 100644 +--- a/dll/directx/wine/d3dx9_34/d3dx9_34.spec ++++ b/dll/directx/wine/d3dx9_34/d3dx9_34.spec +@@ -227,7 +227,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_35/d3dx9_35.spec b/dll/directx/wine/d3dx9_35/d3dx9_35.spec +index 7b6d62df..3e5fb3f3 100644 +--- a/dll/directx/wine/d3dx9_35/d3dx9_35.spec ++++ b/dll/directx/wine/d3dx9_35/d3dx9_35.spec +@@ -227,7 +227,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36.spec b/dll/directx/wine/d3dx9_36/d3dx9_36.spec +index 692321d9..544b744b 100644 +--- a/dll/directx/wine/d3dx9_36/d3dx9_36.spec ++++ b/dll/directx/wine/d3dx9_36/d3dx9_36.spec +@@ -229,7 +229,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_36/mesh.c b/dll/directx/wine/d3dx9_36/mesh.c +index acbb2477..a392a5b5 100644 +--- a/dll/directx/wine/d3dx9_36/mesh.c ++++ b/dll/directx/wine/d3dx9_36/mesh.c +@@ -7186,6 +7186,33 @@ cleanup: + return hr; + } + ++ ++/************************************************************************* ++ * D3DXOptimizeVertices (D3DX9_36.@) ++ */ ++HRESULT WINAPI D3DXOptimizeVertices(const void *indices, UINT num_faces, ++ UINT num_vertices, BOOL indices_are_32bit, DWORD *vertex_remap) ++{ ++ UINT i; ++ ++ FIXME("indices %p, num_faces %u, num_vertices %u, indices_are_32bit %#x, vertex_remap %p semi-stub.\n", ++ indices, num_faces, num_vertices, indices_are_32bit, vertex_remap); ++ ++ if (!vertex_remap) ++ { ++ WARN("vertex remap pointer is NULL.\n"); ++ return D3DERR_INVALIDCALL; ++ } ++ ++ for (i = 0; i < num_vertices; i++) ++ { ++ vertex_remap[i] = i; ++ } ++ ++ return D3D_OK; ++} ++ ++ + /************************************************************************* + * D3DXOptimizeFaces (D3DX9_36.@) + * +diff --git a/dll/directx/wine/d3dx9_37/d3dx9_37.spec b/dll/directx/wine/d3dx9_37/d3dx9_37.spec +index 692321d9..544b744b 100644 +--- a/dll/directx/wine/d3dx9_37/d3dx9_37.spec ++++ b/dll/directx/wine/d3dx9_37/d3dx9_37.spec +@@ -229,7 +229,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_38/d3dx9_38.spec b/dll/directx/wine/d3dx9_38/d3dx9_38.spec +index 692321d9..544b744b 100644 +--- a/dll/directx/wine/d3dx9_38/d3dx9_38.spec ++++ b/dll/directx/wine/d3dx9_38/d3dx9_38.spec +@@ -229,7 +229,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_39/d3dx9_39.spec b/dll/directx/wine/d3dx9_39/d3dx9_39.spec +index 692321d9..544b744b 100644 +--- a/dll/directx/wine/d3dx9_39/d3dx9_39.spec ++++ b/dll/directx/wine/d3dx9_39/d3dx9_39.spec +@@ -229,7 +229,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_40/d3dx9_40.spec b/dll/directx/wine/d3dx9_40/d3dx9_40.spec +index 692321d9..544b744b 100644 +--- a/dll/directx/wine/d3dx9_40/d3dx9_40.spec ++++ b/dll/directx/wine/d3dx9_40/d3dx9_40.spec +@@ -229,7 +229,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_41/d3dx9_41.spec b/dll/directx/wine/d3dx9_41/d3dx9_41.spec +index 692321d9..544b744b 100644 +--- a/dll/directx/wine/d3dx9_41/d3dx9_41.spec ++++ b/dll/directx/wine/d3dx9_41/d3dx9_41.spec +@@ -229,7 +229,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_42/d3dx9_42.spec b/dll/directx/wine/d3dx9_42/d3dx9_42.spec +index 936ae902..f4e70364 100644 +--- a/dll/directx/wine/d3dx9_42/d3dx9_42.spec ++++ b/dll/directx/wine/d3dx9_42/d3dx9_42.spec +@@ -222,7 +222,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/dll/directx/wine/d3dx9_43/d3dx9_43.spec b/dll/directx/wine/d3dx9_43/d3dx9_43.spec +index 936ae902..f4e70364 100644 +--- a/dll/directx/wine/d3dx9_43/d3dx9_43.spec ++++ b/dll/directx/wine/d3dx9_43/d3dx9_43.spec +@@ -222,7 +222,7 @@ + @ stdcall D3DXMatrixTranslation(ptr float float float) + @ stdcall D3DXMatrixTranspose(ptr ptr) + @ stdcall D3DXOptimizeFaces(ptr long long long ptr) +-@ stdcall -stub D3DXOptimizeVertices(ptr long long long ptr) ++@ stdcall D3DXOptimizeVertices(ptr long long long ptr) + @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) + @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) + @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr) +diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c +index 5cb000a5..904a4524 100644 +--- a/modules/rostests/winetests/d3dx9_36/mesh.c ++++ b/modules/rostests/winetests/d3dx9_36/mesh.c +@@ -10331,6 +10331,27 @@ cleanup: + free_test_context(test_context); + } + ++static void test_optimize_vertices(void) ++{ ++ HRESULT hr; ++ DWORD vertex_remap[3]; ++ const DWORD indices[] = {0, 1, 2}; ++ const UINT num_faces = 1; ++ const UINT num_vertices = 3; ++ ++ hr = D3DXOptimizeVertices(indices, num_faces, ++ num_vertices, FALSE, ++ vertex_remap); ++ ok(hr == D3D_OK, "D3DXOptimizeVertices failed. Got %x, expected D3D_OK.\n", hr); ++ ++ /* vertex_remap must not be NULL */ ++ hr = D3DXOptimizeVertices(indices, num_faces, ++ num_vertices, FALSE, ++ NULL); ++ ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeVertices passed NULL vertex_remap " ++ "pointer. Got %x, expected D3DERR_INVALIDCALL.\n", hr); ++} ++ + static void test_optimize_faces(void) + { + HRESULT hr; +@@ -11219,6 +11240,7 @@ START_TEST(mesh) + test_weld_vertices(); + test_clone_mesh(); + test_valid_mesh(); ++ test_optimize_vertices(); + test_optimize_faces(); + test_compute_normals(); + test_D3DXFrameFind();

4 years, 10 months

[reactos] 24/74: [WINESYNC]d3dx9_36/tests: Remove useless \n within some ok messages.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5bab8274d9c07ec0b70ae… commit 5bab8274d9c07ec0b70aeea69490087ecb27e892 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 01:49:33 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36/tests: Remove useless \n within some ok messages. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- modules/rostests/winetests/d3dx9_36/mesh.c | 12 ++--- ..._Remove_useless__n_within_some_ok_messages.diff | 52 ++++++++++++++++++++++ 2 files changed, 58 insertions(+), 6 deletions(-) diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c index 1b0f86ef170..19e8b8e334e 100644 --- a/modules/rostests/winetests/d3dx9_36/mesh.c +++ b/modules/rostests/winetests/d3dx9_36/mesh.c @@ -10154,10 +10154,10 @@ static void test_clone_mesh(void) hr = mesh->lpVtbl->CloneMesh(mesh, tc[i].clone_options, tc[i].new_declaration, test_context->device, &mesh_clone); - ok(hr == D3D_OK, "CloneMesh test case %d failed. Got %x\n, expected D3D_OK\n", i, hr); + ok(hr == D3D_OK, "CloneMesh test case %d failed. Got %x, expected D3D_OK.\n", i, hr); hr = mesh_clone->lpVtbl->GetDeclaration(mesh_clone, new_declaration); - ok(hr == D3D_OK, "GetDeclaration test case %d failed. Got %x\n, expected D3D_OK\n", i, hr); + ok(hr == D3D_OK, "GetDeclaration test case %d failed. Got %x, expected D3D_OK.\n", i, hr); /* Check declaration elements */ for (j = 0; tc[i].new_declaration[j].Stream != 0xFF; j++) { @@ -10344,7 +10344,7 @@ static void test_valid_mesh(void) hr = D3DXValidMesh(mesh, tc[i].adjacency, &errors_and_warnings); todo_wine ok(hr == tc[i].exp_hr, "D3DXValidMesh test case %d failed. " - "Got %x\n, expected %x\n", i, hr, tc[i].exp_hr); + "Got %x, expected %x.\n", i, hr, tc[i].exp_hr); /* Note errors_and_warnings is deliberately not checked because that * would require copying wast amounts of the text output. */ @@ -10488,7 +10488,7 @@ static void test_optimize_faces(void) tc[i].num_vertices, tc[i].indices_are_32bit, face_remap); ok(hr == D3D_OK, "D3DXOptimizeFaces test case %d failed. " - "Got %x\n, expected D3D_OK\n", i, hr); + "Got %x, expected D3D_OK.\n", i, hr); /* Compare face remap with expected face remap */ for (j = 0; j < tc[i].num_faces; j++) @@ -10506,14 +10506,14 @@ static void test_optimize_faces(void) tc[0].num_vertices, tc[0].indices_are_32bit, NULL); ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces passed NULL face_remap " - "pointer. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); + "pointer. Got %x, expected D3DERR_INVALIDCALL.\n", hr); /* Number of faces must be smaller than 2^15 */ hr = D3DXOptimizeFaces(tc[0].indices, 2 << 15, tc[0].num_vertices, FALSE, &smallest_face_remap); ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces should not accept 2^15 " - "faces when using 16-bit indices. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); + "faces when using 16-bit indices. Got %x, expected D3DERR_INVALIDCALL.\n", hr); } static HRESULT clear_normals(ID3DXMesh *mesh) diff --git a/sdk/tools/winesync/d3dx9_staging/0008-d3dx9_36_tests__Remove_useless__n_within_some_ok_messages.diff b/sdk/tools/winesync/d3dx9_staging/0008-d3dx9_36_tests__Remove_useless__n_within_some_ok_messages.diff new file mode 100644 index 00000000000..30ab30672a6 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0008-d3dx9_36_tests__Remove_useless__n_within_some_ok_messages.diff @@ -0,0 +1,52 @@ +diff --git a/modules/rostests/winetests/d3dx9_36/mesh.c b/modules/rostests/winetests/d3dx9_36/mesh.c +index 3fcd65f..5cb000a 100644 +--- a/modules/rostests/winetests/d3dx9_36/mesh.c ++++ b/modules/rostests/winetests/d3dx9_36/mesh.c +@@ -10123,10 +10123,10 @@ static void test_clone_mesh(void) + + hr = mesh->lpVtbl->CloneMesh(mesh, tc[i].clone_options, tc[i].new_declaration, + test_context->device, &mesh_clone); +- ok(hr == D3D_OK, "CloneMesh test case %d failed. Got %x\n, expected D3D_OK\n", i, hr); ++ ok(hr == D3D_OK, "CloneMesh test case %d failed. Got %x, expected D3D_OK.\n", i, hr); + + hr = mesh_clone->lpVtbl->GetDeclaration(mesh_clone, new_declaration); +- ok(hr == D3D_OK, "GetDeclaration test case %d failed. Got %x\n, expected D3D_OK\n", i, hr); ++ ok(hr == D3D_OK, "GetDeclaration test case %d failed. Got %x, expected D3D_OK.\n", i, hr); + /* Check declaration elements */ + for (j = 0; tc[i].new_declaration[j].Stream != 0xFF; j++) + { +@@ -10313,7 +10313,7 @@ static void test_valid_mesh(void) + + hr = D3DXValidMesh(mesh, tc[i].adjacency, &errors_and_warnings); + todo_wine ok(hr == tc[i].exp_hr, "D3DXValidMesh test case %d failed. " +- "Got %x\n, expected %x\n", i, hr, tc[i].exp_hr); ++ "Got %x, expected %x.\n", i, hr, tc[i].exp_hr); + + /* Note errors_and_warnings is deliberately not checked because that + * would require copying wast amounts of the text output. */ +@@ -10457,7 +10457,7 @@ static void test_optimize_faces(void) + tc[i].num_vertices, tc[i].indices_are_32bit, + face_remap); + ok(hr == D3D_OK, "D3DXOptimizeFaces test case %d failed. " +- "Got %x\n, expected D3D_OK\n", i, hr); ++ "Got %x, expected D3D_OK.\n", i, hr); + + /* Compare face remap with expected face remap */ + for (j = 0; j < tc[i].num_faces; j++) +@@ -10475,14 +10475,14 @@ static void test_optimize_faces(void) + tc[0].num_vertices, tc[0].indices_are_32bit, + NULL); + ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces passed NULL face_remap " +- "pointer. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); ++ "pointer. Got %x, expected D3DERR_INVALIDCALL.\n", hr); + + /* Number of faces must be smaller than 2^15 */ + hr = D3DXOptimizeFaces(tc[0].indices, 2 << 15, + tc[0].num_vertices, FALSE, + &smallest_face_remap); + ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeFaces should not accept 2^15 " +- "faces when using 16-bit indices. Got %x\n, expected D3DERR_INVALIDCALL\n", hr); ++ "faces when using 16-bit indices. Got %x, expected D3DERR_INVALIDCALL.\n", hr); + } + + static HRESULT clear_normals(ID3DXMesh *mesh)

4 years, 10 months

[reactos] 23/74: [WINESYNC]d3dx9_36/tests: Add additional tests for special cases.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06983139f6c16cc22079b… commit 06983139f6c16cc22079ba99927dc10dac4af964 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 01:49:33 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36/tests: Add additional tests for special cases. wine-staging patch by Christian Costa <titan.costa(a)gmail.com> --- modules/rostests/winetests/d3dx9_36/shader.c | 163 ++++++++++++++++++ ...ts__Add_additional_tests_for_special_cases.diff | 188 +++++++++++++++++++++ 2 files changed, 351 insertions(+) diff --git a/modules/rostests/winetests/d3dx9_36/shader.c b/modules/rostests/winetests/d3dx9_36/shader.c index 02675c65b53..0d7dcc34883 100644 --- a/modules/rostests/winetests/d3dx9_36/shader.c +++ b/modules/rostests/winetests/d3dx9_36/shader.c @@ -6575,6 +6575,60 @@ static void test_shader_semantics(void) } } +static const DWORD ps_tex[] = { + 0xffff0103, /* ps_1_3 */ + 0x00000042, 0xb00f0000, /* tex t0 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD ps_texld_1_4[] = { + 0xffff0104, /* ps_1_4 */ + 0x00000042, 0xb00f0000, 0xa0e40000, /* texld t0, c0 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD ps_texld_2_0[] = { + 0xffff0200, /* ps_2_0 */ + 0x00000042, 0xb00f0000, 0xa0e40000, 0xa0e40001, /* texld t0, c0, c1 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD ps_texcoord[] = { + 0xffff0103, /* ps_1_4 */ + 0x00000040, 0xb00f0000, /* texcoord t0 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD ps_texcrd[] = { + 0xffff0104, /* ps_2_0 */ + 0x00000040, 0xb00f0000, 0xa0e40000, /* texcrd t0, c0 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD ps_sincos_2_0[] = { + 0xffff0200, /* ps_2_0 */ + 0x00000025, 0xb00f0000, 0xa0e40000, 0xa0e40001, 0xa0e40002, /* sincos t0, c0, c1, c2 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD ps_sincos_3_0[] = { + 0xffff0300, /* ps_3_0 */ + 0x00000025, 0xb00f0000, 0xa0e40000, /* sincos t0, c0 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD vs_sincos_2_0[] = { + 0xfffe0200, /* vs_2_0 */ + 0x00000025, 0xb00f0000, 0xa0e40000, 0xa0e40001, 0xa0e40002, /* sincos a0, c0, c1, c2 */ + 0x00000000, /* nop */ + 0x0000ffff}; + +static const DWORD vs_sincos_3_0[] = { + 0xfffe0300, /* vs_3_0 */ + 0x00000025, 0xb00f0000, 0xa0e40000, /* sincos a0, c0 */ + 0x00000000, /* nop */ + 0x0000ffff}; + static void test_disassemble_shader(void) { static const char disasm_vs[] = " vs_1_1\n" @@ -6589,6 +6643,33 @@ static void test_disassemble_shader(void) " dp3 r0, c1, c0\n" " mul r0, v0, r0\n" " mul r0, t0, r0\n"; + static const char disasm_ps_tex[] = " ps_1_3\n" + " tex t0\n" + " nop\n"; + static const char disasm_ps_texld_1_4[] = " ps_1_4\n" + " texld t0, c0\n" + " nop\n"; + static const char disasm_ps_texld_2_0[] = " ps_2_0\n" + " texld t0, c0, c1\n" + " nop\n"; + static const char disasm_ps_texcoord[] = " ps_1_3\n" + " texcoord t0\n" + " nop\n"; + static const char disasm_ps_texcrd[] = " ps_1_4\n" + " texcrd t0, c0\n" + " nop\n"; + static const char disasm_ps_sincos_2_0[] = " ps_2_0\n" + " sincos t0, c0, c1, c2\n" + " nop\n"; + static const char disasm_ps_sincos_3_0[] = " ps_3_0\n" + " sincos t0, c0\n" + " nop\n"; + static const char disasm_vs_sincos_2_0[] = " vs_2_0\n" + " sincos a0, c0, c1, c2\n" + " nop\n"; + static const char disasm_vs_sincos_3_0[] = " vs_3_0\n" + " sincos a0, c0\n" + " nop\n"; ID3DXBuffer *disassembly; HRESULT ret; char *ptr; @@ -6618,6 +6699,88 @@ static void test_disassemble_shader(void) ok(!memcmp(ptr, disasm_ps, sizeof(disasm_ps) - 1), /* compare beginning */ "Returned '%s', expected '%s'\n", ptr, disasm_ps); ID3DXBuffer_Release(disassembly); + + /* Test tex instruction with pixel shader 1.3 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(ps_tex, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps_tex, sizeof(disasm_ps_tex) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps_tex); + ID3DXBuffer_Release(disassembly); + + /* Test texld instruction with pixel shader 1.4 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(ps_texld_1_4, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps_texld_1_4, sizeof(disasm_ps_texld_1_4) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps_texld_1_4); + ID3DXBuffer_Release(disassembly); + + /* Test texld instruction with pixel shader 2.0 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(ps_texld_2_0, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps_texld_2_0, sizeof(disasm_ps_texld_2_0) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps_texld_2_0); + ID3DXBuffer_Release(disassembly); + + /* Test texcoord instruction with pixel shader 1.3 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(ps_texcoord, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps_texcoord, sizeof(disasm_ps_texcoord) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps_texcoord); + ID3DXBuffer_Release(disassembly); + + /* Test texcrd instruction with pixel shader 1.4 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(ps_texcrd, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps_texcrd, sizeof(disasm_ps_texcrd) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps_texcrd); + ID3DXBuffer_Release(disassembly); + + /* Test sincos instruction pixel shader 2.0 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(ps_sincos_2_0, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps_sincos_2_0, sizeof(disasm_ps_sincos_2_0) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps_sincos_2_0); + ID3DXBuffer_Release(disassembly); + + /* Test sincos instruction with pixel shader 3.0 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(ps_sincos_3_0, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps_sincos_3_0, sizeof(disasm_ps_sincos_3_0) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps_sincos_3_0); + ID3DXBuffer_Release(disassembly); + + /* Test sincos instruction with pixel shader 2.0 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(vs_sincos_2_0, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_vs_sincos_2_0, sizeof(disasm_vs_sincos_2_0) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_vs_sincos_2_0); + ID3DXBuffer_Release(disassembly); + + /* Test sincos instruction with pixel shader 3.0 */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(vs_sincos_3_0, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_vs_sincos_3_0, sizeof(disasm_vs_sincos_3_0) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_vs_sincos_3_0); + ID3DXBuffer_Release(disassembly); + } START_TEST(shader) diff --git a/sdk/tools/winesync/d3dx9_staging/0007-d3dx9_36_tests__Add_additional_tests_for_special_cases.diff b/sdk/tools/winesync/d3dx9_staging/0007-d3dx9_36_tests__Add_additional_tests_for_special_cases.diff new file mode 100644 index 00000000000..fb56871fa5e --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0007-d3dx9_36_tests__Add_additional_tests_for_special_cases.diff @@ -0,0 +1,188 @@ +diff --git a/modules/rostests/winetests/d3dx9_36/shader.c b/modules/rostests/winetests/d3dx9_36/shader.c +index 02675c6..0d7dcc3 100644 +--- a/modules/rostests/winetests/d3dx9_36/shader.c ++++ b/modules/rostests/winetests/d3dx9_36/shader.c +@@ -6575,6 +6575,60 @@ static void test_shader_semantics(void) + } + } + ++static const DWORD ps_tex[] = { ++ 0xffff0103, /* ps_1_3 */ ++ 0x00000042, 0xb00f0000, /* tex t0 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD ps_texld_1_4[] = { ++ 0xffff0104, /* ps_1_4 */ ++ 0x00000042, 0xb00f0000, 0xa0e40000, /* texld t0, c0 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD ps_texld_2_0[] = { ++ 0xffff0200, /* ps_2_0 */ ++ 0x00000042, 0xb00f0000, 0xa0e40000, 0xa0e40001, /* texld t0, c0, c1 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD ps_texcoord[] = { ++ 0xffff0103, /* ps_1_4 */ ++ 0x00000040, 0xb00f0000, /* texcoord t0 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD ps_texcrd[] = { ++ 0xffff0104, /* ps_2_0 */ ++ 0x00000040, 0xb00f0000, 0xa0e40000, /* texcrd t0, c0 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD ps_sincos_2_0[] = { ++ 0xffff0200, /* ps_2_0 */ ++ 0x00000025, 0xb00f0000, 0xa0e40000, 0xa0e40001, 0xa0e40002, /* sincos t0, c0, c1, c2 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD ps_sincos_3_0[] = { ++ 0xffff0300, /* ps_3_0 */ ++ 0x00000025, 0xb00f0000, 0xa0e40000, /* sincos t0, c0 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD vs_sincos_2_0[] = { ++ 0xfffe0200, /* vs_2_0 */ ++ 0x00000025, 0xb00f0000, 0xa0e40000, 0xa0e40001, 0xa0e40002, /* sincos a0, c0, c1, c2 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ ++static const DWORD vs_sincos_3_0[] = { ++ 0xfffe0300, /* vs_3_0 */ ++ 0x00000025, 0xb00f0000, 0xa0e40000, /* sincos a0, c0 */ ++ 0x00000000, /* nop */ ++ 0x0000ffff}; ++ + static void test_disassemble_shader(void) + { + static const char disasm_vs[] = " vs_1_1\n" +@@ -6589,6 +6643,33 @@ static void test_disassemble_shader(void) + " dp3 r0, c1, c0\n" + " mul r0, v0, r0\n" + " mul r0, t0, r0\n"; ++ static const char disasm_ps_tex[] = " ps_1_3\n" ++ " tex t0\n" ++ " nop\n"; ++ static const char disasm_ps_texld_1_4[] = " ps_1_4\n" ++ " texld t0, c0\n" ++ " nop\n"; ++ static const char disasm_ps_texld_2_0[] = " ps_2_0\n" ++ " texld t0, c0, c1\n" ++ " nop\n"; ++ static const char disasm_ps_texcoord[] = " ps_1_3\n" ++ " texcoord t0\n" ++ " nop\n"; ++ static const char disasm_ps_texcrd[] = " ps_1_4\n" ++ " texcrd t0, c0\n" ++ " nop\n"; ++ static const char disasm_ps_sincos_2_0[] = " ps_2_0\n" ++ " sincos t0, c0, c1, c2\n" ++ " nop\n"; ++ static const char disasm_ps_sincos_3_0[] = " ps_3_0\n" ++ " sincos t0, c0\n" ++ " nop\n"; ++ static const char disasm_vs_sincos_2_0[] = " vs_2_0\n" ++ " sincos a0, c0, c1, c2\n" ++ " nop\n"; ++ static const char disasm_vs_sincos_3_0[] = " vs_3_0\n" ++ " sincos a0, c0\n" ++ " nop\n"; + ID3DXBuffer *disassembly; + HRESULT ret; + char *ptr; +@@ -6618,6 +6699,88 @@ static void test_disassemble_shader(void) + ok(!memcmp(ptr, disasm_ps, sizeof(disasm_ps) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps); + ID3DXBuffer_Release(disassembly); ++ ++ /* Test tex instruction with pixel shader 1.3 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(ps_tex, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps_tex, sizeof(disasm_ps_tex) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps_tex); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test texld instruction with pixel shader 1.4 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(ps_texld_1_4, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps_texld_1_4, sizeof(disasm_ps_texld_1_4) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps_texld_1_4); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test texld instruction with pixel shader 2.0 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(ps_texld_2_0, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps_texld_2_0, sizeof(disasm_ps_texld_2_0) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps_texld_2_0); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test texcoord instruction with pixel shader 1.3 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(ps_texcoord, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps_texcoord, sizeof(disasm_ps_texcoord) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps_texcoord); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test texcrd instruction with pixel shader 1.4 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(ps_texcrd, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps_texcrd, sizeof(disasm_ps_texcrd) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps_texcrd); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test sincos instruction pixel shader 2.0 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(ps_sincos_2_0, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps_sincos_2_0, sizeof(disasm_ps_sincos_2_0) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps_sincos_2_0); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test sincos instruction with pixel shader 3.0 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(ps_sincos_3_0, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps_sincos_3_0, sizeof(disasm_ps_sincos_3_0) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps_sincos_3_0); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test sincos instruction with pixel shader 2.0 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(vs_sincos_2_0, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_vs_sincos_2_0, sizeof(disasm_vs_sincos_2_0) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_vs_sincos_2_0); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test sincos instruction with pixel shader 3.0 */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(vs_sincos_3_0, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_vs_sincos_3_0, sizeof(disasm_vs_sincos_3_0) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_vs_sincos_3_0); ++ ID3DXBuffer_Release(disassembly); ++ + } + + START_TEST(shader)

4 years, 10 months

[reactos] 22/74: [WINESYNC]d3dx9_36/tests: Add initial tests for D3DXDisassembleShader.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9fef76cb44eca1ab5a93b… commit 9fef76cb44eca1ab5a93bb8eff07515ee955f358 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sat Jan 4 01:49:33 2020 +0100 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Wed Feb 26 18:19:18 2020 +0100 [WINESYNC]d3dx9_36/tests: Add initial tests for D3DXDisassembleShader. wine-staging patch by Sebastian Lackner <sebastian(a)fds-team.de> --- modules/rostests/winetests/d3dx9_36/shader.c | 46 ++++++++++++++++ ...dd_initial_tests_for_D3DXDisassembleShader.diff | 62 ++++++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/modules/rostests/winetests/d3dx9_36/shader.c b/modules/rostests/winetests/d3dx9_36/shader.c index b67ffb209c4..02675c65b53 100644 --- a/modules/rostests/winetests/d3dx9_36/shader.c +++ b/modules/rostests/winetests/d3dx9_36/shader.c @@ -6575,6 +6575,51 @@ static void test_shader_semantics(void) } } +static void test_disassemble_shader(void) +{ + static const char disasm_vs[] = " vs_1_1\n" + " dcl_position v0\n" + " dp4 oPos.x, v0, c0\n" + " dp4 oPos.y, v0, c1\n" + " dp4 oPos.z, v0, c2\n" + " dp4 oPos.w, v0, c3\n"; + static const char disasm_ps[] = " ps_1_1\n" + " def c1, 1, 0, 0, 0\n" + " tex t0\n" + " dp3 r0, c1, c0\n" + " mul r0, v0, r0\n" + " mul r0, t0, r0\n"; + ID3DXBuffer *disassembly; + HRESULT ret; + char *ptr; + + /* Check wrong parameters */ + ret = D3DXDisassembleShader(NULL, FALSE, NULL, NULL); + ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL); + ret = D3DXDisassembleShader(NULL, FALSE, NULL, &disassembly); + ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL); + ret = D3DXDisassembleShader(simple_vs, FALSE, NULL, NULL); + ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL); + + /* Test with vertex shader */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(simple_vs, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_vs, sizeof(disasm_vs) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_vs); + ID3DXBuffer_Release(disassembly); + + /* Test with pixel shader */ + disassembly = (void *)0xdeadbeef; + ret = D3DXDisassembleShader(simple_ps, FALSE, NULL, &disassembly); + ok(ret == D3D_OK, "Failed with %#x\n", ret); + ptr = ID3DXBuffer_GetBufferPointer(disassembly); + ok(!memcmp(ptr, disasm_ps, sizeof(disasm_ps) - 1), /* compare beginning */ + "Returned '%s', expected '%s'\n", ptr, disasm_ps); + ID3DXBuffer_Release(disassembly); +} + START_TEST(shader) { test_get_shader_size(); @@ -6589,4 +6634,5 @@ START_TEST(shader) test_registerset(); test_registerset_defaults(); test_shader_semantics(); + test_disassemble_shader(); } diff --git a/sdk/tools/winesync/d3dx9_staging/0006-d3dx9_36_tests__Add_initial_tests_for_D3DXDisassembleShader.diff b/sdk/tools/winesync/d3dx9_staging/0006-d3dx9_36_tests__Add_initial_tests_for_D3DXDisassembleShader.diff new file mode 100644 index 00000000000..9c56aa31739 --- /dev/null +++ b/sdk/tools/winesync/d3dx9_staging/0006-d3dx9_36_tests__Add_initial_tests_for_D3DXDisassembleShader.diff @@ -0,0 +1,62 @@ +diff --git a/modules/rostests/winetests/d3dx9_36/shader.c b/modules/rostests/winetests/d3dx9_36/shader.c +index b67ffb2..02675c6 100644 +--- a/modules/rostests/winetests/d3dx9_36/shader.c ++++ b/modules/rostests/winetests/d3dx9_36/shader.c +@@ -6575,6 +6575,51 @@ static void test_shader_semantics(void) + } + } + ++static void test_disassemble_shader(void) ++{ ++ static const char disasm_vs[] = " vs_1_1\n" ++ " dcl_position v0\n" ++ " dp4 oPos.x, v0, c0\n" ++ " dp4 oPos.y, v0, c1\n" ++ " dp4 oPos.z, v0, c2\n" ++ " dp4 oPos.w, v0, c3\n"; ++ static const char disasm_ps[] = " ps_1_1\n" ++ " def c1, 1, 0, 0, 0\n" ++ " tex t0\n" ++ " dp3 r0, c1, c0\n" ++ " mul r0, v0, r0\n" ++ " mul r0, t0, r0\n"; ++ ID3DXBuffer *disassembly; ++ HRESULT ret; ++ char *ptr; ++ ++ /* Check wrong parameters */ ++ ret = D3DXDisassembleShader(NULL, FALSE, NULL, NULL); ++ ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL); ++ ret = D3DXDisassembleShader(NULL, FALSE, NULL, &disassembly); ++ ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL); ++ ret = D3DXDisassembleShader(simple_vs, FALSE, NULL, NULL); ++ ok(ret == D3DERR_INVALIDCALL, "Returned %#x, expected %#x\n", ret, D3DERR_INVALIDCALL); ++ ++ /* Test with vertex shader */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(simple_vs, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_vs, sizeof(disasm_vs) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_vs); ++ ID3DXBuffer_Release(disassembly); ++ ++ /* Test with pixel shader */ ++ disassembly = (void *)0xdeadbeef; ++ ret = D3DXDisassembleShader(simple_ps, FALSE, NULL, &disassembly); ++ ok(ret == D3D_OK, "Failed with %#x\n", ret); ++ ptr = ID3DXBuffer_GetBufferPointer(disassembly); ++ ok(!memcmp(ptr, disasm_ps, sizeof(disasm_ps) - 1), /* compare beginning */ ++ "Returned '%s', expected '%s'\n", ptr, disasm_ps); ++ ID3DXBuffer_Release(disassembly); ++} ++ + START_TEST(shader) + { + test_get_shader_size(); +@@ -6589,4 +6634,5 @@ START_TEST(shader) + test_registerset(); + test_registerset_defaults(); + test_shader_semantics(); ++ test_disassemble_shader(); + }

4 years, 10 months

← Newer
1
2
3
4
5
6
7
8
9
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2020