October 2012 - Wine-commits

Jacek Caban : mshtml: Get rid of no longer used painting fallback for missing Gecko.
by Alexandre Julliard 23 Oct '12

23 Oct '12

1 0

Frédéric Delanoy : cmd/tests: Add tests for GEQ comparison operator in "if" statements.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 43f5471cbaadc4655a363da351712e24b88eb94e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f5471cbaadc4655a363da35… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 23 03:10:27 2012 +0200 cmd/tests: Add tests for GEQ comparison operator in "if" statements. --- programs/cmd/tests/test_builtins.cmd | 12 ++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 25 +++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index e940b2d..b7e72ec 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -699,6 +699,11 @@ for %%i in (%STR_PARMS%) do call :NEQtest %%i B for %%i in (%STR_PARMS%) do call :NEQtest %%i AB for %%i in (%STR_PARMS%) do call :NEQtest %%i BA for %%i in (%STR_PARMS%) do call :NEQtest %%i AA +for %%i in (%STR_PARMS%) do call :GEQtest %%i A +for %%i in (%STR_PARMS%) do call :GEQtest %%i B +for %%i in (%STR_PARMS%) do call :GEQtest %%i AB +for %%i in (%STR_PARMS%) do call :GEQtest %%i BA +for %%i in (%STR_PARMS%) do call :GEQtest %%i AA echo ------ for numbers if -1 LSS 1 (echo negative numbers handled) if not -1 LSS -10 (echo negative numbers handled) @@ -728,6 +733,10 @@ for %%i in (%INT_PARMS%) do call :NEQtest %%i 0 for %%i in (%INT_PARMS%) do call :NEQtest %%i 1 for %%i in (%INT_PARMS%) do call :NEQtest %%i 10 for %%i in (%INT_PARMS%) do call :NEQtest %%i 9 +for %%i in (%INT_PARMS%) do call :GEQtest %%i 0 +for %%i in (%INT_PARMS%) do call :GEQtest %%i 1 +for %%i in (%INT_PARMS%) do call :GEQtest %%i 10 +for %%i in (%INT_PARMS%) do call :GEQtest %%i 9 goto :endIfCompOpsSubroutines rem IF subroutines helpers @@ -743,6 +752,9 @@ goto :eof :NEQtest if %1 NEQ %2 echo %1 NEQ %2 goto :eof +:GEQtest +if %1 GEQ %2 echo %1 GEQ %2 +goto :eof :endIfCompOpsSubroutines set STR_PARMS= diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index c04c775..81686ff 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -507,6 +507,21 @@ LSS string can be used as operand for LSS comparison @todo_wine(a)B NEQ AA @todo_wine(a)AB NEQ AA @todo_wine(a)BA NEQ AA +(a)todo_wine@A GEQ A +(a)todo_wine@B GEQ A +(a)todo_wine@AB GEQ A +(a)todo_wine@BA GEQ A +(a)todo_wine@AA GEQ A +(a)todo_wine@B GEQ B +(a)todo_wine@BA GEQ B +(a)todo_wine@B GEQ AB +(a)todo_wine@AB GEQ AB +(a)todo_wine@BA GEQ AB +(a)todo_wine@BA GEQ BA +(a)todo_wine@B GEQ AA +(a)todo_wine@AB GEQ AA +(a)todo_wine@BA GEQ AA +(a)todo_wine@AA GEQ AA ------ for numbers negative numbers handled negative numbers handled @@ -551,6 +566,16 @@ also in negative form @todo_wine(a)0 NEQ 9 @todo_wine(a)1 NEQ 9 @todo_wine(a)10 NEQ 9 +(a)todo_wine@0 GEQ 0 +(a)todo_wine@1 GEQ 0 +(a)todo_wine@10 GEQ 0 +(a)todo_wine@9 GEQ 0 +(a)todo_wine@1 GEQ 1 +(a)todo_wine@10 GEQ 1 +(a)todo_wine@9 GEQ 1 +(a)todo_wine@10 GEQ 10 +(a)todo_wine@10 GEQ 9 +(a)todo_wine@9 GEQ 9 ------------ Testing for ------------ --- plain FOR A

1 0

Frédéric Delanoy : cmd/tests: Add tests for GTR comparison operator in "if" statements.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 5888ad35377d30683a30723e3975835474527a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5888ad35377d30683a30723e3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 23 03:10:28 2012 +0200 cmd/tests: Add tests for GTR comparison operator in "if" statements. --- programs/cmd/tests/test_builtins.cmd | 12 ++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 16 ++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index b7e72ec..4256056 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -704,6 +704,11 @@ for %%i in (%STR_PARMS%) do call :GEQtest %%i B for %%i in (%STR_PARMS%) do call :GEQtest %%i AB for %%i in (%STR_PARMS%) do call :GEQtest %%i BA for %%i in (%STR_PARMS%) do call :GEQtest %%i AA +for %%i in (%STR_PARMS%) do call :GTRtest %%i A +for %%i in (%STR_PARMS%) do call :GTRtest %%i B +for %%i in (%STR_PARMS%) do call :GTRtest %%i AB +for %%i in (%STR_PARMS%) do call :GTRtest %%i BA +for %%i in (%STR_PARMS%) do call :GTRtest %%i AA echo ------ for numbers if -1 LSS 1 (echo negative numbers handled) if not -1 LSS -10 (echo negative numbers handled) @@ -737,6 +742,10 @@ for %%i in (%INT_PARMS%) do call :GEQtest %%i 0 for %%i in (%INT_PARMS%) do call :GEQtest %%i 1 for %%i in (%INT_PARMS%) do call :GEQtest %%i 10 for %%i in (%INT_PARMS%) do call :GEQtest %%i 9 +for %%i in (%INT_PARMS%) do call :GTRtest %%i 0 +for %%i in (%INT_PARMS%) do call :GTRtest %%i 1 +for %%i in (%INT_PARMS%) do call :GTRtest %%i 10 +for %%i in (%INT_PARMS%) do call :GTRtest %%i 9 goto :endIfCompOpsSubroutines rem IF subroutines helpers @@ -755,6 +764,9 @@ goto :eof :GEQtest if %1 GEQ %2 echo %1 GEQ %2 goto :eof +:GTRtest +if %1 GTR %2 echo %1 GTR %2 +goto :eof :endIfCompOpsSubroutines set STR_PARMS= diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 81686ff..6c1825e 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -522,6 +522,16 @@ LSS string can be used as operand for LSS comparison @todo_wine(a)AB GEQ AA @todo_wine(a)BA GEQ AA @todo_wine(a)AA GEQ AA +(a)todo_wine@B GTR A +(a)todo_wine@AB GTR A +(a)todo_wine@BA GTR A +(a)todo_wine@AA GTR A +(a)todo_wine@BA GTR B +(a)todo_wine@B GTR AB +(a)todo_wine@BA GTR AB +(a)todo_wine@B GTR AA +(a)todo_wine@AB GTR AA +(a)todo_wine@BA GTR AA ------ for numbers negative numbers handled negative numbers handled @@ -576,6 +586,12 @@ also in negative form @todo_wine(a)10 GEQ 10 @todo_wine(a)10 GEQ 9 @todo_wine(a)9 GEQ 9 +(a)todo_wine@1 GTR 0 +(a)todo_wine@10 GTR 0 +(a)todo_wine@9 GTR 0 +(a)todo_wine@10 GTR 1 +(a)todo_wine@9 GTR 1 +(a)todo_wine@10 GTR 9 ------------ Testing for ------------ --- plain FOR A

1 0

Frédéric Delanoy : cmd/tests: Add tests for mixed number/stringified numbers comparisons in "if" statements.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: c5faceabd23e7a8c20712b3bcbcd6d1753f13abe URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5faceabd23e7a8c20712b3bc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 23 03:10:29 2012 +0200 cmd/tests: Add tests for mixed number/stringified numbers comparisons in "if" statements. --- programs/cmd/tests/test_builtins.cmd | 19 +++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 17 +++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 4256056..d314336 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -746,6 +746,25 @@ for %%i in (%INT_PARMS%) do call :GTRtest %%i 0 for %%i in (%INT_PARMS%) do call :GTRtest %%i 1 for %%i in (%INT_PARMS%) do call :GTRtest %%i 10 for %%i in (%INT_PARMS%) do call :GTRtest %%i 9 +echo ------ for numbers and stringified numbers +if not "1" EQU 1 (echo strings and integers not equal) else echo foo +if not 1 EQU "1" (echo strings and integers not equal) else echo foo +if '1' EQU 1 echo '1' EQU 1 +if 1 EQU '1' echo 1 EQU '1' +if not "1" GEQ 1 (echo foo) else echo bar +if "10" GEQ "1" echo "10" GEQ "1" +if '1' GEQ 1 (echo '1' GEQ 1) else echo NT4 +if 1 GEQ "1" echo 1 GEQ "1" +if "1" GEQ "1" echo "1" GEQ "1" +if '1' GEQ "1" echo '1' GEQ "1" +if "10" GEQ "1" echo "10" GEQ "1" +if not 1 GEQ '1' (echo non NT4) else echo 1 GEQ '1' +for %%i in ("1" '1') do call :GEQtest %%i '1' +if "10" GEQ '1' (echo "10" GEQ '1') else echo foo +if 1 GEQ "10" (echo 1 GEQ "10") else echo foo +if "1" GEQ "10" (echo 1 GEQ "10") else echo foo +if '1' GEQ "10" (echo '1' GEQ "10") else echo foo +if "10" GEQ "10" (echo "10" GEQ "10") goto :endIfCompOpsSubroutines rem IF subroutines helpers diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 6c1825e..020246a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -592,6 +592,23 @@ also in negative form @todo_wine(a)10 GTR 1 @todo_wine(a)9 GTR 1 @todo_wine(a)10 GTR 9 +------ for numbers and stringified numbers +strings and integers not equal +strings and integers not equal +foo +(a)todo_wine@"10" GEQ "1" +(a)todo_wine@'1' GEQ 1(a)or_broken@NT4 +(a)todo_wine@1 GEQ "1" +(a)todo_wine@"1" GEQ "1" +(a)todo_wine@'1' GEQ "1" +(a)todo_wine@"10" GEQ "1" +(a)todo_wine@non NT4(a)or_broken@1 GEQ '1' +(a)todo_wine@'1' GEQ '1' +(a)todo_wine@foo +(a)todo_wine@1 GEQ "10" +(a)todo_wine@foo +(a)todo_wine@'1' GEQ "10" +(a)todo_wine@"10" GEQ "10" ------------ Testing for ------------ --- plain FOR A

1 0

Dmitry Timoshkov : gdiplus: Test also lf.lfEscapement and lf. lfOrientation returned by GdipGetLogFont.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 5e65f95542cba1aa99be94785feae874dd957e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e65f95542cba1aa99be94785… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 23 17:27:48 2012 +0900 gdiplus: Test also lf.lfEscapement and lf.lfOrientation returned by GdipGetLogFont. --- dlls/gdiplus/tests/font.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 568f9b7..fade7d3 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -857,6 +857,8 @@ static void test_font_transform(void) expect(Ok, status); expect(-100, lf.lfHeight); expect(0, lf.lfWidth); + expect(0, lf.lfEscapement); + expect(0, lf.lfOrientation); status = GdipGetFontHeight(font, graphics, &height); expect(Ok, status); expectf(120.703125, height); @@ -905,6 +907,8 @@ todo_wine todo_wine expect(-300, lf.lfHeight); expect(0, lf.lfWidth); + expect(0, lf.lfEscapement); + expect(0, lf.lfOrientation); status = GdipGetFontHeight(font, graphics, &height); expect(Ok, status); expectf(120.703125, height); @@ -953,6 +957,10 @@ todo_wine todo_wine expect(-300, lf.lfHeight); expect(0, lf.lfWidth); +todo_wine + expect(3151, lf.lfEscapement); +todo_wine + expect(3151, lf.lfOrientation); status = GdipGetFontHeight(font, graphics, &height); expect(Ok, status); expectf(120.703125, height); @@ -1002,6 +1010,10 @@ todo_wine todo_wine expect(1032, lf.lfHeight); expect(0, lf.lfWidth); +todo_wine + expect(3099, lf.lfEscapement); +todo_wine + expect(3099, lf.lfOrientation); status = GdipGetFontHeight(font, graphics, &height); expect(Ok, status); expectf(120.703125, height); @@ -1051,6 +1063,10 @@ todo_wine todo_wine expect(1032, lf.lfHeight); expect(0, lf.lfWidth); +todo_wine + expect(3099, lf.lfEscapement); +todo_wine + expect(3099, lf.lfOrientation); status = GdipGetFontHeight(font, graphics, &height); expect(Ok, status); expectf(120.703125, height);

1 0

Henri Verbeet : wined3d: Explicitly check the shader type in shader_generate_glsl_declarations().
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 81ae7f606b8e4e97c3a4d7a1c884d918b23f6083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ae7f606b8e4e97c3a4d7a1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 11:23:41 2012 +0200 wined3d: Explicitly check the shader type in shader_generate_glsl_declarations(). --- dlls/wined3d/glsl_shader.c | 107 ++++++++++++++++++++++++-------------------- 1 files changed, 59 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81ae7f606b8e4e97c3a4d…

1 0

Henri Verbeet : wined3d: Move shader_is_pshader_version() and shader_is_vshader_version() to the ARB program shader backend.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 6f025deba66821f2f3702d87de125058992e7d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f025deba66821f2f3702d87d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 11:23:42 2012 +0200 wined3d: Move shader_is_pshader_version() and shader_is_vshader_version() to the ARB program shader backend. --- dlls/wined3d/arb_program_shader.c | 10 ++++++++++ dlls/wined3d/wined3d_private.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5201998..87e89fd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -39,6 +39,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); WINE_DECLARE_DEBUG_CHANNEL(d3d_constants); WINE_DECLARE_DEBUG_CHANNEL(d3d); +static BOOL shader_is_pshader_version(enum wined3d_shader_type type) +{ + return type == WINED3D_SHADER_TYPE_PIXEL; +} + +static BOOL shader_is_vshader_version(enum wined3d_shader_type type) +{ + return type == WINED3D_SHADER_TYPE_VERTEX; +} + /* Extract a line. Note that this modifies the source string. */ static char *get_line(char **ptr) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 06f75de..2116aa6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2654,16 +2654,6 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_sh const struct wined3d_shader_reg_maps *reg_maps, const DWORD *byte_code, void *backend_ctx) DECLSPEC_HIDDEN; BOOL shader_match_semantic(const char *semantic_name, enum wined3d_decl_usage usage) DECLSPEC_HIDDEN; -static inline BOOL shader_is_pshader_version(enum wined3d_shader_type type) -{ - return type == WINED3D_SHADER_TYPE_PIXEL; -} - -static inline BOOL shader_is_vshader_version(enum wined3d_shader_type type) -{ - return type == WINED3D_SHADER_TYPE_VERTEX; -} - static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) { switch (reg->type)

1 0

Henri Verbeet : include: Add the D3DDisassemble() prototype and flags.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 6e4fd6b171fba63b0240d055e2d94593bd86d7a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e4fd6b171fba63b0240d055e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 11:23:43 2012 +0200 include: Add the D3DDisassemble() prototype and flags. --- include/d3dcompiler.h | 46 +++++++++++++++++++++++++++------------------- 1 files changed, 27 insertions(+), 19 deletions(-) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 3950143..047c1ea 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -25,25 +25,31 @@ extern "C" { #endif -#define D3DCOMPILE_DEBUG 0x0001 -#define D3DCOMPILE_SKIP_VALIDATION 0x0002 -#define D3DCOMPILE_SKIP_OPTIMIZATION 0x0004 -#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x0008 -#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x0010 -#define D3DCOMPILE_PARTIAL_PRECISION 0x0020 -#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x0040 -#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x0080 -#define D3DCOMPILE_NO_PRESHADER 0x0100 -#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x0200 -#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x0400 -#define D3DCOMPILE_ENABLE_STRICTNESS 0x0800 -#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x1000 -#define D3DCOMPILE_IEEE_STRICTNESS 0x2000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x4000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x0000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL2 0xC000 -#define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x8000 -#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x40000 +#define D3DCOMPILE_DEBUG 0x00000001 +#define D3DCOMPILE_SKIP_VALIDATION 0x00000002 +#define D3DCOMPILE_SKIP_OPTIMIZATION 0x00000004 +#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x00000008 +#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x00000010 +#define D3DCOMPILE_PARTIAL_PRECISION 0x00000020 +#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x00000040 +#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x00000080 +#define D3DCOMPILE_NO_PRESHADER 0x00000100 +#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x00000200 +#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x00000400 +#define D3DCOMPILE_ENABLE_STRICTNESS 0x00000800 +#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x00001000 +#define D3DCOMPILE_IEEE_STRICTNESS 0x00002000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x00004000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x00000000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL2 0x0000c000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x00008000 +#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x00040000 + +#define D3D_DISASM_ENABLE_COLOR_CODE 0x00000001 +#define D3D_DISASM_ENABLE_DEFAULT_VALUE_PRINTS 0x00000002 +#define D3D_DISASM_ENABLE_INSTRUCTION_NUMBERING 0x00000004 +#define D3D_DISASM_ENABLE_INSTRUCTION_CYCLE 0x00000008 +#define D3D_DISASM_DISABLE_DEBUG_INFO 0x00000010 HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, @@ -75,6 +81,8 @@ typedef enum D3D_BLOB_PART D3D_BLOB_TEST_COMPILE_PERF } D3D_BLOB_PART; +HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T data_size, + UINT flags, const char *comments, ID3DBlob **disassembly); HRESULT WINAPI D3DGetBlobPart(const void *data, SIZE_T data_size, D3D_BLOB_PART part, UINT flags, ID3DBlob **blob); HRESULT WINAPI D3DGetInputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob); HRESULT WINAPI D3DGetOutputSignatureBlob(const void *data, SIZE_T data_size, ID3DBlob **blob);

1 0

Henri Verbeet : wined3d: Get rid of the mostly unused "num_textures_used" field from arbfp_ffp_desc.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 672ad0610876f344f0cf1309b8a0747ebab3a93a URL: http://source.winehq.org/git/wine.git/?a=commit;h=672ad0610876f344f0cf1309b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 11:23:44 2012 +0200 wined3d: Get rid of the mostly unused "num_textures_used" field from arbfp_ffp_desc. --- dlls/wined3d/arb_program_shader.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 87e89fd..2a74171 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5618,7 +5618,6 @@ struct arbfp_ffp_desc { struct ffp_frag_desc parent; GLuint shader; - unsigned int num_textures_used; }; /* Context activation and GL locking are done by the caller. */ @@ -6421,13 +6420,6 @@ static void fragment_prog_arbfp(struct wined3d_context *context, const struct wi ERR("Out of memory\n"); return; } - new_desc->num_textures_used = 0; - for (i = 0; i < gl_info->limits.texture_stages; ++i) - { - if (settings.op[i].cop == WINED3D_TOP_DISABLE) - break; - new_desc->num_textures_used = i; - } memcpy(&new_desc->parent.settings, &settings, sizeof(settings)); new_desc->shader = gen_arbfp_ffp_shader(&settings, gl_info);

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DPIXELSHADER9.
by Alexandre Julliard 23 Oct '12

23 Oct '12

Module: wine Branch: master Commit: 4704e78337985b3011915c937dbed03c9777b485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4704e78337985b3011915c937… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 23 11:23:45 2012 +0200 d3dx9: Avoid LPDIRECT3DPIXELSHADER9. --- dlls/d3dx9_36/effect.c | 37 +++++++++++++++---------------------- dlls/d3dx9_36/tests/effect.c | 14 +++++++------- include/d3dx9effect.h | 8 ++++---- 3 files changed, 26 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4704e78337985b3011915…

1 0