December 2009 - Wine-commits

Christian Costa : d3dxof: Get rid of cur_subobject.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: 24d6c0a90db075acbcf7f3cf97ece56d1068d814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d6c0a90db075acbcf7f3cf9… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Dec 30 22:06:11 2009 +0100 d3dxof: Get rid of cur_subobject. --- dlls/d3dxof/d3dxof.c | 8 +++----- dlls/d3dxof/d3dxof_private.h | 1 - dlls/d3dxof/parsing.c | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index cd4690d..67e4f61 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -280,7 +280,6 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV object->buf.pdxf = This; object->buf.txt = (header[2] == XOFFILE_FORMAT_TEXT); object->buf.token_present = FALSE; - object->buf.cur_subobject = 0; TRACE("File size is %d bytes\n", file_size); @@ -1044,7 +1043,6 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE This->buf.pxo_globals = This->xobjects; This->buf.nb_pxo_globals = This->nb_xobjects; - This->buf.cur_subobject = 1; This->buf.level = 0; This->buf.pxo_tab = HeapAlloc(GetProcessHeap(), 0, sizeof(xobject)*MAX_SUBOBJECTS); @@ -1059,6 +1057,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE This->buf.pxo->pdata = This->buf.pdata = NULL; This->buf.capacity = 0; This->buf.cur_pos_data = 0; + This->buf.pxo->nb_subobjects = 1; pstrings = HeapAlloc(GetProcessHeap(), 0, MAX_STRINGS_BUFFER); if (!pstrings) @@ -1076,10 +1075,9 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE goto error; } - This->buf.pxo->nb_subobjects = This->buf.cur_subobject; - if (This->buf.cur_subobject > MAX_SUBOBJECTS) + if (This->buf.pxo->nb_subobjects > MAX_SUBOBJECTS) { - FIXME("Too many suobjects %d\n", This->buf.cur_subobject); + FIXME("Too many subobjects %d\n", This->buf.pxo->nb_subobjects); hr = DXFILEERR_BADALLOC; goto error; } diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 13c5f54..ffa27d2 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -128,7 +128,6 @@ typedef struct { WORD current_token; BOOL token_present; BOOL txt; - ULONG cur_subobject; ULONG cur_pos_data; LPBYTE cur_pstrings; BYTE value[100]; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index fb5ab4e..ec962b0 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1212,14 +1212,14 @@ _exit: ERR("Reference to unknown object %s\n", (char*)buf->value); return FALSE; } - buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->cur_subobject++]; + buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; buf->pxo->childs[buf->pxo->nb_childs]->ptarget = &(buf->pxo_globals[i])[j]; buf->pxo->nb_childs++; } else if (check_TOKEN(buf) == TOKEN_NAME) { xobject* pxo = buf->pxo; - buf->pxo = buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->cur_subobject++]; + buf->pxo = buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; TRACE("Enter optional %s\n", (char*)buf->value); buf->level++;

1 0

Christian Costa : d3dxof: Enable referencing objects defined in current top-level object.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: 39772f9749e8b73b0eff879099453d41b085d0cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=39772f9749e8b73b0eff87909… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Dec 30 22:06:18 2009 +0100 d3dxof: Enable referencing objects defined in current top-level object. --- dlls/d3dxof/parsing.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index ec962b0..f4fb3d2 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -1198,7 +1198,7 @@ static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) if (get_TOKEN(buf) != TOKEN_CBRACE) return FALSE; TRACE("Found optional reference %s\n", (char*)buf->value); - for (i = 0; i < buf->nb_pxo_globals; i++) + for (i = 0; i < (buf->nb_pxo_globals+1); i++) { for (j = 0; j < (buf->pxo_globals[i])[0].nb_subobjects; j++) { @@ -1207,7 +1207,7 @@ static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) } } _exit: - if (i == buf->nb_pxo_globals) + if (i == (buf->nb_pxo_globals+1)) { ERR("Reference to unknown object %s\n", (char*)buf->value); return FALSE;

1 0

Joel Holdsworth : user32: Fixed icons to select correct image in high colour depth.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: 95ac10e526f9949802c8b76a969a942a9a4c2727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ac10e526f9949802c8b76a9… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Dec 30 20:00:08 2009 +0000 user32: Fixed icons to select correct image in high colour depth. --- dlls/user32/cursoricon.c | 68 +++++++++++++++++++++------------------------- 1 files changed, 31 insertions(+), 37 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 188500a..9a36499 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -468,10 +468,10 @@ typedef BOOL (*fnGetCIEntry)( LPVOID dir, int n, /********************************************************************** * CURSORICON_FindBestIcon * - * Find the icon closest to the requested size and number of colors. + * Find the icon closest to the requested size and bit depth. */ static int CURSORICON_FindBestIcon( LPVOID dir, fnGetCIEntry get_entry, - int width, int height, int colors ) + int width, int height, int depth ) { int i, cx, cy, bits, bestEntry = -1; UINT iTotalDiff, iXDiff=0, iYDiff=0, iColorDiff; @@ -498,7 +498,7 @@ static int CURSORICON_FindBestIcon( LPVOID dir, fnGetCIEntry get_entry, { if(abs(width - cx) == iXDiff && abs(height - cy) == iYDiff) { - iTempColorDiff = abs(colors - (1<<bits)); + iTempColorDiff = abs(depth - bits); if(iColorDiff > iTempColorDiff) { bestEntry = i; @@ -533,7 +533,7 @@ static BOOL CURSORICON_GetResIconEntry( LPVOID dir, int n, * FIXME: parameter 'color' ignored. */ static int CURSORICON_FindBestCursor( LPVOID dir, fnGetCIEntry get_entry, - int width, int height, int color ) + int width, int height, int depth ) { int i, maxwidth, maxheight, cx, cy, bits, bestEntry = -1; @@ -588,22 +588,22 @@ static BOOL CURSORICON_GetResCursorEntry( LPVOID dir, int n, } static CURSORICONDIRENTRY *CURSORICON_FindBestIconRes( CURSORICONDIR * dir, - int width, int height, int colors ) + int width, int height, int depth ) { int n; n = CURSORICON_FindBestIcon( dir, CURSORICON_GetResIconEntry, - width, height, colors ); + width, height, depth ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; } static CURSORICONDIRENTRY *CURSORICON_FindBestCursorRes( CURSORICONDIR *dir, - int width, int height, int color ) + int width, int height, int depth ) { int n = CURSORICON_FindBestCursor( dir, CURSORICON_GetResCursorEntry, - width, height, color ); + width, height, depth ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; @@ -625,20 +625,20 @@ static BOOL CURSORICON_GetFileEntry( LPVOID dir, int n, } static CURSORICONFILEDIRENTRY *CURSORICON_FindBestCursorFile( CURSORICONFILEDIR *dir, - int width, int height, int color ) + int width, int height, int depth ) { int n = CURSORICON_FindBestCursor( dir, CURSORICON_GetFileEntry, - width, height, color ); + width, height, depth ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; } static CURSORICONFILEDIRENTRY *CURSORICON_FindBestIconFile( CURSORICONFILEDIR *dir, - int width, int height, int color ) + int width, int height, int depth ) { int n = CURSORICON_FindBestIcon( dir, CURSORICON_GetFileEntry, - width, height, color ); + width, height, depth ); if ( n < 0 ) return NULL; return &dir->idEntries[n]; @@ -964,7 +964,7 @@ static void riff_find_chunk( DWORD chunk_id, DWORD chunk_type, const riff_chunk_ * \- CHUNK:icon */ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, - INT width, INT height, INT colors ) + INT width, INT height, INT depth ) { HCURSOR cursor; ani_header header = {0}; @@ -1017,7 +1017,7 @@ static HCURSOR CURSORICON_CreateIconFromANI( const LPBYTE bits, DWORD bits_size, icon_data = fram_chunk.data + (2 * sizeof(DWORD)); entry = CURSORICON_FindBestIconFile( (CURSORICONFILEDIR *) icon_data, - width, height, colors ); + width, height, depth ); frame_bits = HeapAlloc( GetProcessHeap(), 0, entry->dwDIBSize ); memcpy( frame_bits, icon_data + entry->dwDIBOffset, entry->dwDIBSize ); @@ -1086,7 +1086,7 @@ HICON WINAPI CreateIconFromResource( LPBYTE bits, UINT cbSize, static HICON CURSORICON_LoadFromFile( LPCWSTR filename, - INT width, INT height, INT colors, + INT width, INT height, INT depth, BOOL fCursor, UINT loadflags) { CURSORICONFILEDIRENTRY *entry; @@ -1106,7 +1106,7 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, if (memcmp( bits, "RIFF", 4 ) == 0) { hIcon = CURSORICON_CreateIconFromANI( bits, filesize, width, height, - colors ); + depth ); goto end; } @@ -1118,9 +1118,9 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, goto end; if ( fCursor ) - entry = CURSORICON_FindBestCursorFile( dir, width, height, colors ); + entry = CURSORICON_FindBestCursorFile( dir, width, height, depth ); else - entry = CURSORICON_FindBestIconFile( dir, width, height, colors ); + entry = CURSORICON_FindBestIconFile( dir, width, height, depth ); if ( !entry ) goto end; @@ -1157,7 +1157,7 @@ end: * Load a cursor or icon from resource or file. */ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, - INT width, INT height, INT colors, + INT width, INT height, INT depth, BOOL fCursor, UINT loadflags) { HANDLE handle = 0; @@ -1169,11 +1169,11 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, WORD wResId; DWORD dwBytesInRes; - TRACE("%p, %s, %dx%d, colors %d, fCursor %d, flags 0x%04x\n", - hInstance, debugstr_w(name), width, height, colors, fCursor, loadflags); + TRACE("%p, %s, %dx%d, depth %d, fCursor %d, flags 0x%04x\n", + hInstance, debugstr_w(name), width, height, depth, fCursor, loadflags); if ( loadflags & LR_LOADFROMFILE ) /* Load from file */ - return CURSORICON_LoadFromFile( name, width, height, colors, fCursor, loadflags ); + return CURSORICON_LoadFromFile( name, width, height, depth, fCursor, loadflags ); if (!hInstance) hInstance = user32_module; /* Load OEM cursor/icon */ @@ -1192,9 +1192,9 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, if (!(handle = LoadResource( hInstance, hRsrc ))) return 0; if (!(dir = LockResource( handle ))) return 0; if (fCursor) - dirEntry = CURSORICON_FindBestCursorRes( dir, width, height, colors ); + dirEntry = CURSORICON_FindBestCursorRes( dir, width, height, depth ); else - dirEntry = CURSORICON_FindBestIconRes( dir, width, height, colors ); + dirEntry = CURSORICON_FindBestIconRes( dir, width, height, depth ); if (!dirEntry) return 0; wResId = dirEntry->wResId; dwBytesInRes = dirEntry->dwBytesInRes; @@ -1767,21 +1767,16 @@ INT WINAPI LookupIconIdFromDirectoryEx( LPBYTE xdir, BOOL bIcon, if( dir && !dir->idReserved && (dir->idType & 3) ) { CURSORICONDIRENTRY* entry; - HDC hdc; - UINT palEnts; - int colors; - hdc = GetDC(0); - palEnts = GetSystemPaletteEntries(hdc, 0, 0, NULL); - if (palEnts == 0) - palEnts = 256; - colors = (cFlag & LR_MONOCHROME) ? 2 : palEnts; + const HDC hdc = GetDC(0); + const int depth = (cFlag & LR_MONOCHROME) ? + 1 : GetDeviceCaps(hdc, BITSPIXEL); ReleaseDC(0, hdc); if( bIcon ) - entry = CURSORICON_FindBestIconRes( dir, width, height, colors ); + entry = CURSORICON_FindBestIconRes( dir, width, height, depth ); else - entry = CURSORICON_FindBestCursorRes( dir, width, height, colors ); + entry = CURSORICON_FindBestCursorRes( dir, width, height, depth ); if( entry ) retVal = entry->wResId; } @@ -2532,10 +2527,9 @@ HANDLE WINAPI LoadImageW( HINSTANCE hinst, LPCWSTR name, UINT type, if (!screen_dc) screen_dc = CreateDCW( DISPLAYW, NULL, NULL, NULL ); if (screen_dc) { - UINT palEnts = GetSystemPaletteEntries(screen_dc, 0, 0, NULL); - if (palEnts == 0) palEnts = 256; return CURSORICON_Load(hinst, name, desiredx, desiredy, - palEnts, FALSE, loadflags); + GetDeviceCaps(screen_dc, BITSPIXEL), + FALSE, loadflags); } break;

1 0

Rob Shearman : jscript: Make sure retv pointer is initialised in exec_source even if no value needs to be returned .
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: 7db81aeb67ce1bba1ea8fcf9167ca0147e2cfe32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7db81aeb67ce1bba1ea8fcf91… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Dec 30 17:33:48 2009 +0000 jscript: Make sure retv pointer is initialised in exec_source even if no value needs to be returned. --- dlls/jscript/engine.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index b9c40ae..653aca3 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -493,8 +493,12 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so if(retv && (exec_type == EXECT_EVAL || rt.type == RT_RETURN)) *retv = val; - else + else { + if (retv) { + VariantInit(retv); + } VariantClear(&val); + } return S_OK; }

1 0

Rob Shearman : jscript: Make sure to initialise the string output parameter in run_exec.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: 07183b28eb9a501c8da77a4295235b0690f9f0a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07183b28eb9a501c8da77a429… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Wed Dec 30 17:33:52 2009 +0000 jscript: Make sure to initialise the string output parameter in run_exec. --- dlls/jscript/regexp.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index ff9807b..05b6062 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3642,6 +3642,9 @@ static HRESULT run_exec(script_ctx_t *ctx, vdisp_t *jsthis, VARIANT *arg, jsexce SysFreeString(string); set_last_index(regexp, 0); *ret = VARIANT_FALSE; + if(input) { + *input = NULL; + } return S_OK; }

1 0

Andrew Eikum : hlink: String target reference is actually moniker target' s display name.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: 57a47b0833f7be226be8ed8d0407a250e6a02cc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57a47b0833f7be226be8ed8d0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 30 11:43:05 2009 -0600 hlink: String target reference is actually moniker target's display name. The original implementation treated the string target in IHlink as a separate entity from the moniker target. In reality, the string target is just the moniker target's display name and setting one reference also sets the other. --- dlls/hlink/hlink_main.c | 43 ++--------------- dlls/hlink/link.c | 65 +++++++++++++++++++------- dlls/hlink/tests/hlink.c | 114 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 165 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57a47b0833f7be226be8e…

1 0

Henri Verbeet : wined3d: Merge pixelshader.c and vertexshader.c.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: 2b1ee87328cb5ac4b18360fd83e85cb221efa43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1ee87328cb5ac4b18360fd8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 30 19:33:39 2009 +0100 wined3d: Merge pixelshader.c and vertexshader.c. --- dlls/wined3d/Makefile.in | 3 +- dlls/wined3d/pixelshader.c | 435 ------------------------ dlls/wined3d/shader.c | 788 +++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/vertexshader.c | 374 -------------------- 4 files changed, 789 insertions(+), 811 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b1ee87328cb5ac4b1836…

1 0

Henri Verbeet : wined3d: Always handle WINED3DSPR_INPUT registers as input registers in shader_get_registers_used ().
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: 736aaf7d09de36223f156b864fccef9093b57dba URL: http://source.winehq.org/git/wine.git/?a=commit;h=736aaf7d09de36223f156b864… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 30 19:33:40 2009 +0100 wined3d: Always handle WINED3DSPR_INPUT registers as input registers in shader_get_registers_used(). The "attributes" vertexshader field is now derived from the input signature, and only used to speed up matching D3D9 vertex declaration elements to shader inputs. D3D8 and D3D10 both explicitly specify input registers. --- dlls/wined3d/baseshader.c | 64 ++++++++++++++++++++------------------- dlls/wined3d/shader.c | 15 ++++++++- dlls/wined3d/wined3d_private.h | 5 ++- 3 files changed, 49 insertions(+), 35 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index bb94a5a..14416c4 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -363,26 +363,26 @@ static unsigned int get_instr_extra_regcount(enum WINED3D_SHADER_INSTRUCTION_HAN } } -static const char *shader_semantic_name_from_usage(WINED3DDECLUSAGE usage) +static const char *semantic_names[] = { - static const char *semantic_names[] = - { - /* WINED3DDECLUSAGE_POSITION */ "SV_POSITION", - /* WINED3DDECLUSAGE_BLENDWEIGHT */ "BLENDWEIGHT", - /* WINED3DDECLUSAGE_BLENDINDICES */ "BLENDINDICES", - /* WINED3DDECLUSAGE_NORMAL */ "NORMAL", - /* WINED3DDECLUSAGE_PSIZE */ "PSIZE", - /* WINED3DDECLUSAGE_TEXCOORD */ "TEXCOORD", - /* WINED3DDECLUSAGE_TANGENT */ "TANGENT", - /* WINED3DDECLUSAGE_BINORMAL */ "BINORMAL", - /* WINED3DDECLUSAGE_TESSFACTOR */ "TESSFACTOR", - /* WINED3DDECLUSAGE_POSITIONT */ "POSITIONT", - /* WINED3DDECLUSAGE_COLOR */ "COLOR", - /* WINED3DDECLUSAGE_FOG */ "FOG", - /* WINED3DDECLUSAGE_DEPTH */ "DEPTH", - /* WINED3DDECLUSAGE_SAMPLE */ "SAMPLE", - }; + /* WINED3DDECLUSAGE_POSITION */ "SV_POSITION", + /* WINED3DDECLUSAGE_BLENDWEIGHT */ "BLENDWEIGHT", + /* WINED3DDECLUSAGE_BLENDINDICES */ "BLENDINDICES", + /* WINED3DDECLUSAGE_NORMAL */ "NORMAL", + /* WINED3DDECLUSAGE_PSIZE */ "PSIZE", + /* WINED3DDECLUSAGE_TEXCOORD */ "TEXCOORD", + /* WINED3DDECLUSAGE_TANGENT */ "TANGENT", + /* WINED3DDECLUSAGE_BINORMAL */ "BINORMAL", + /* WINED3DDECLUSAGE_TESSFACTOR */ "TESSFACTOR", + /* WINED3DDECLUSAGE_POSITIONT */ "POSITIONT", + /* WINED3DDECLUSAGE_COLOR */ "COLOR", + /* WINED3DDECLUSAGE_FOG */ "FOG", + /* WINED3DDECLUSAGE_DEPTH */ "DEPTH", + /* WINED3DDECLUSAGE_SAMPLE */ "SAMPLE", +}; +static const char *shader_semantic_name_from_usage(WINED3DDECLUSAGE usage) +{ if (usage >= sizeof(semantic_names) / sizeof(*semantic_names)) { FIXME("Unrecognized usage %#x\n", usage); @@ -392,6 +392,18 @@ static const char *shader_semantic_name_from_usage(WINED3DDECLUSAGE usage) return semantic_names[usage]; } +WINED3DDECLUSAGE shader_usage_from_semantic_name(const char *name) +{ + unsigned int i; + + for (i = 0; i < sizeof(semantic_names) / sizeof(*semantic_names); ++i) + { + if (!strcmp(name, semantic_names[i])) return i; + } + + return ~0U; +} + BOOL shader_match_semantic(const char *semantic_name, WINED3DDECLUSAGE usage) { return !strcmp(semantic_name, shader_semantic_name_from_usage(usage)); @@ -412,8 +424,7 @@ static void shader_signature_from_semantic(struct wined3d_shader_signature_eleme * as an address register. */ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3d_shader_frontend *fe, - struct shader_reg_maps *reg_maps, struct wined3d_shader_attribute *attributes, - struct wined3d_shader_signature_element *input_signature, + struct shader_reg_maps *reg_maps, struct wined3d_shader_signature_element *input_signature, struct wined3d_shader_signature_element *output_signature, const DWORD *byte_code, DWORD constf_size) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; @@ -473,19 +484,10 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 switch (semantic.reg.reg.type) { - /* Vshader: mark attributes used - * Pshader: mark 3.0 input registers used, save token */ + /* Mark input registers used. */ case WINED3DSPR_INPUT: reg_maps->input_registers |= 1 << semantic.reg.reg.idx; - if (shader_version.type == WINED3D_SHADER_TYPE_VERTEX) - { - attributes[semantic.reg.reg.idx].usage = semantic.usage; - attributes[semantic.reg.reg.idx].usage_idx = semantic.usage_idx; - } - else - { - shader_signature_from_semantic(&input_signature[semantic.reg.reg.idx], &semantic); - } + shader_signature_from_semantic(&input_signature[semantic.reg.reg.idx], &semantic); break; /* Vshader: mark 3.0 output registers used, save token */ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2e758ff..93e1a0e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -288,6 +288,7 @@ static HRESULT vertexshader_set_function(IWineD3DVertexShaderImpl *shader, const struct wined3d_shader_frontend *fe; unsigned int i; HRESULT hr; + WORD map; TRACE("shader %p, byte_code %p, output_signature %p.\n", shader, byte_code, output_signature); @@ -317,10 +318,20 @@ static HRESULT vertexshader_set_function(IWineD3DVertexShaderImpl *shader, shader->min_rel_offset = device->d3d_vshader_constantF; shader->max_rel_offset = 0; hr = shader_get_registers_used((IWineD3DBaseShader *)shader, fe, - reg_maps, shader->attributes, NULL, shader->output_signature, + reg_maps, shader->input_signature, shader->output_signature, byte_code, device->d3d_vshader_constantF); if (FAILED(hr)) return hr; + + map = shader->baseShader.reg_maps.input_registers; + for (i = 0; map; map >>= 1, ++i) + { + if (!(map & 1) || !shader->baseShader.input_signature[i].semantic_name) continue; + + shader->attributes[i].usage = shader_usage_from_semantic_name(shader->input_signature[i].semantic_name); + shader->attributes[i].usage_idx = shader->input_signature[i].semantic_idx; + } + if (output_signature) { for (i = 0; i < output_signature->element_count; ++i) @@ -666,7 +677,7 @@ static HRESULT pixelshader_set_function(IWineD3DPixelShaderImpl *shader, /* Second pass: figure out which registers are used, what the semantics are, etc.. */ hr = shader_get_registers_used((IWineD3DBaseShader *)shader, fe, - reg_maps, NULL, shader->input_signature, NULL, + reg_maps, shader->input_signature, NULL, byte_code, device->d3d_pshader_constantF); if (FAILED(hr)) return hr; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b22a7b2..64e1f05 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2647,8 +2647,7 @@ unsigned int shader_find_free_input_register(const struct shader_reg_maps *reg_m void shader_generate_main(IWineD3DBaseShader *iface, struct wined3d_shader_buffer *buffer, const shader_reg_maps *reg_maps, const DWORD *pFunction, void *backend_ctx) DECLSPEC_HIDDEN; HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3d_shader_frontend *fe, - struct shader_reg_maps *reg_maps, struct wined3d_shader_attribute *attributes, - struct wined3d_shader_signature_element *input_signature, + struct shader_reg_maps *reg_maps, struct wined3d_shader_signature_element *input_signature, struct wined3d_shader_signature_element *output_signature, const DWORD *byte_code, DWORD constf_size) DECLSPEC_HIDDEN; void shader_init(struct IWineD3DBaseShaderClass *shader, IWineD3DDeviceImpl *device, @@ -2656,6 +2655,7 @@ void shader_init(struct IWineD3DBaseShaderClass *shader, IWineD3DDeviceImpl *dev BOOL shader_match_semantic(const char *semantic_name, WINED3DDECLUSAGE usage) DECLSPEC_HIDDEN; const struct wined3d_shader_frontend *shader_select_frontend(DWORD version_token) DECLSPEC_HIDDEN; void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe_data, const DWORD *pFunction) DECLSPEC_HIDDEN; +WINED3DDECLUSAGE shader_usage_from_semantic_name(const char *semantic_name) DECLSPEC_HIDDEN; static inline BOOL shader_is_pshader_version(enum wined3d_shader_type type) { @@ -2731,6 +2731,7 @@ typedef struct IWineD3DVertexShaderImpl { /* Vertex shader input and output semantics */ struct wined3d_shader_attribute attributes[MAX_ATTRIBS]; + struct wined3d_shader_signature_element input_signature[max(MAX_ATTRIBS, MAX_REG_INPUT)]; struct wined3d_shader_signature_element output_signature[MAX_REG_OUTPUT]; UINT min_rel_offset, max_rel_offset;

1 0

Henri Verbeet : wined3d: Move shader input/ output signatures to IWineD3DBaseShaderClass.
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: b548e387aef1dcf71e88f784082b326faf63cbc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b548e387aef1dcf71e88f7840… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 30 19:33:41 2009 +0100 wined3d: Move shader input/output signatures to IWineD3DBaseShaderClass. --- dlls/wined3d/arb_program_shader.c | 47 +++++++++++++++++++----------------- dlls/wined3d/glsl_shader.c | 11 ++++---- dlls/wined3d/shader.c | 11 ++++---- dlls/wined3d/wined3d_private.h | 8 +++--- 4 files changed, 41 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b548e387aef1dcf71e88f…

1 0

Henri Verbeet : wined3d: Merge vertexshader_set_function() and pixelshader_set_function().
by Alexandre Julliard 31 Dec '09

31 Dec '09

Module: wine Branch: master Commit: 14da44aa364539d2c2d392c042921cc430b21c47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14da44aa364539d2c2d392c04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 30 19:33:42 2009 +0100 wined3d: Merge vertexshader_set_function() and pixelshader_set_function(). --- dlls/wined3d/shader.c | 188 +++++++++++++++++++------------------------------ 1 files changed, 72 insertions(+), 116 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=14da44aa364539d2c2d39…

1 0