May 2024 - Wine-Commits - list.winehq.org

Yuxuan Shui : shell32: Make sure array passed to PathResolve is big enough.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 436e96c5cb2887af239e1131f81d7cf002c1ac02 URL: https://gitlab.winehq.org/wine/wine/-/commit/436e96c5cb2887af239e1131f81d7c… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Mon May 20 09:00:30 2024 +0100 shell32: Make sure array passed to PathResolve is big enough. --- dlls/shell32/shlexec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index d2fe3caed88..f0cf27c5098 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -599,7 +599,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, WCHAR wBuffer[256]; /* Used to GetProfileString */ UINT retval = SE_ERR_NOASSOC; WCHAR *tok; /* token pointer */ - WCHAR xlpFile[256]; /* result of SearchPath */ + WCHAR xlpFile[MAX_PATH]; /* result of SearchPath */ DWORD attribs; /* file attributes */ WCHAR curdir[MAX_PATH]; const WCHAR *search_paths[3] = {0}; @@ -634,7 +634,7 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpVerb, } else search_paths[0] = curdir; - GetCurrentDirectoryW(MAX_PATH, curdir); + GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); lstrcpyW(xlpFile, lpFile); if (PathResolveAW(xlpFile, (const void **)search_paths, PRF_TRYPROGRAMEXTENSIONS | PRF_VERIFYEXISTS)) {

1 0

Francis De Brabandere : vbscript/tests: Fix error clear call.
by Alexandre Julliard May 31, 2024

May 31, 2024

Module: wine Branch: master Commit: 1c88cb4e4ea8ffc0f7895d1f6525817896d336fd URL: https://gitlab.winehq.org/wine/wine/-/commit/1c88cb4e4ea8ffc0f7895d1f652581… Author: Francis De Brabandere <francisdb(a)gmail.com> Date: Fri May 24 13:22:42 2024 +0000 vbscript/tests: Fix error clear call. --- dlls/vbscript/tests/api.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3974781d6a8..7b8744f4c74 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -131,7 +131,7 @@ if isEnglishLang then TestCStr true, "True" sub testCStrError() on error resume next - Error.clear() + Err.clear() CStr(null) call ok(Err.number = 94, "Err.number = " & Err.number) if isEnglishLang then call ok(Err.source = "Microsoft VBScript runtime error", "Err.source = " & Err.source)

1 0

Nikolay Sivov : vkd3d-shader/fx: Do not write shared buffers block when not compiling as a child effect.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: vkd3d Branch: master Commit: 5265fbb789703b79ef83a32ed625b9b9fa118331 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5265fbb789703b79ef83a32ed625b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 30 13:59:36 2024 +0200 vkd3d-shader/fx: Do not write shared buffers block when not compiling as a child effect. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/fx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 57b4ac24..d8653dbf 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -1464,6 +1464,9 @@ static void write_buffers(struct fx_write_context *fx, bool shared) { struct hlsl_buffer *buffer; + if (shared && !fx->child_effect) + return; + LIST_FOR_EACH_ENTRY(buffer, &fx->ctx->buffers, struct hlsl_buffer, entry) { if (!buffer->size && !fx->include_empty_buffers)

1 0

Nikolay Sivov : tests: Add a few tests for the NULL value.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: vkd3d Branch: master Commit: 727aacca189c07e9d5ff0793cb1dec70ede5a45b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/727aacca189c07e9d5ff0793cb1de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 28 14:43:36 2024 +0200 tests: Add a few tests for the NULL value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + tests/hlsl/null.shader_test | 81 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/Makefile.am b/Makefile.am index 619bcdf4..46772fd9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -162,6 +162,7 @@ vkd3d_shader_tests = \ tests/hlsl/nointerpolation.shader_test \ tests/hlsl/non-const-indexing.shader_test \ tests/hlsl/normalize.shader_test \ + tests/hlsl/null.shader_test \ tests/hlsl/numeric-constructor-truncation.shader_test \ tests/hlsl/numeric-types.shader_test \ tests/hlsl/numthreads.shader_test \ diff --git a/tests/hlsl/null.shader_test b/tests/hlsl/null.shader_test new file mode 100644 index 00000000..bf0a0ce5 --- /dev/null +++ b/tests/hlsl/null.shader_test @@ -0,0 +1,81 @@ +[pixel shader fail] +float4 var = NULL; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +float4x4 var = NULL; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail] +struct s +{ + float4 f; +}; + +float4 main() : sv_target +{ + s var = (s)NULL; + return s.f; +} + +[pixel shader fail(sm<6)] +Texture var = null; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader todo] +SamplerState s +{ + UnknownField = NULL; +}; + +Texture t = NULL; +PixelShader ps = NULL; +VertexShader vs = NULL; + +float4 main() : sv_target +{ + return 0; +} + +[require] +shader model >= 4.0 + +[pixel shader fail(sm>=6) todo] +Texture2DMS<float4> t = NULL; + +RWTexture1D<float4> u1 = NULL; +RWTexture2D<float4> u2 = NULL; +RWTexture3D<float4> u3 = NULL; + +RWTexture1DArray<float4> ua1 = NULL; +RWTexture2DArray<float4> ua2 = NULL; + +RWBuffer<float4> b1 = NULL; + +float4 main() : sv_target +{ + return 0; +} + +[require] +shader model >= 5.0 + +[pixel shader fail(sm>=6) todo] +RasterizerOrderedTexture2D<uint4> t1 = NULL; + +float4 main() : sv_target +{ + return 0; +}

1 0

Henri Verbeet : vkd3d-shader/ir: Rename the "handler_idx" field of struct vkd3d_shader_instruction to "opcode".
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: vkd3d Branch: master Commit: 1fe7a6581b305af724e70868472d5880ec52f9d2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1fe7a6581b305af724e70868472d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 24 20:34:42 2024 +0200 vkd3d-shader/ir: Rename the "handler_idx" field of struct vkd3d_shader_instruction to "opcode". --- libs/vkd3d-shader/d3d_asm.c | 12 +-- libs/vkd3d-shader/d3dbc.c | 14 +-- libs/vkd3d-shader/dxil.c | 45 +++++----- libs/vkd3d-shader/glsl.c | 6 +- libs/vkd3d-shader/ir.c | 144 +++++++++++++++--------------- libs/vkd3d-shader/spirv.c | 146 +++++++++++++++---------------- libs/vkd3d-shader/tpf.c | 28 +++--- libs/vkd3d-shader/vkd3d_shader_main.c | 28 +++--- libs/vkd3d-shader/vkd3d_shader_private.h | 6 +- 9 files changed, 215 insertions(+), 214 deletions(-)

1 0

Nikolay Sivov : tests: Add some basic tests for ConstantBuffer type.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: vkd3d Branch: master Commit: 163aaf9729787bbcc1f348b11f12e8e8803c6a32 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/163aaf9729787bbcc1f348b11f12e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 24 09:43:39 2024 +0200 tests: Add some basic tests for ConstantBuffer type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- tests/hlsl/cbuffer.shader_test | 89 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/tests/hlsl/cbuffer.shader_test b/tests/hlsl/cbuffer.shader_test index 1297b72b..733322ce 100644 --- a/tests/hlsl/cbuffer.shader_test +++ b/tests/hlsl/cbuffer.shader_test @@ -860,3 +860,92 @@ uniform 12 float4 12.0 13.0 14.0 15.0 uniform 16 float4 16.0 17.0 18.0 19.0 todo(glsl) draw quad probe all rgba (124.0, 135.0, 146.0, 150.5) + +[require] +shader model >= 5.1 + +[pixel shader fail todo] +float4 ConstantBuffer; + +float4 main() : sv_target +{ + return ConstantBuffer; +} + +[pixel shader fail] +struct s +{ + float4 m; +}; + +float4 cb; +ConstantBuffer<s> cb; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail(sm>=6) todo] +struct s +{ + float4 m; +}; + +float4 main() : sv_target +{ + // Local variable do not create resource definitions, + // acting like a constant + ConstantBuffer<s> cb = (s)1; + float4 var = 0.1f; + var += cb.m; + return var; +} + +[test] +todo draw quad +probe all rgba (1.1, 1.1, 1.1, 1.1) + +[pixel shader fail] +struct s +{ + float4 m; +}; + +float4 main() : sv_target +{ + ConstantBuffer<s> cb = (s)0; + cb.m = 1.0f; + return cb.m; +} + +[pixel shader todo] +struct s +{ + float4 m; +}; + +float4 var; + +ConstantBuffer<s> cb[2][3] : register(b1); +cbuffer cb +{ + float4 m2; +}; + +float4 main() : sv_target +{ + return 0; +} + +[require] +shader model >= 2.0 +shader model < 5.1 + +[pixel shader] +float4 ConstantBuffer; + +float4 main() : sv_target +{ + return ConstantBuffer; +}

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Handle "unsigned int" type.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: vkd3d Branch: master Commit: ea177a7750401c898699c5e3ab50f991195c550d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ea177a7750401c898699c5e3ab50f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 18 23:29:58 2024 +0200 vkd3d-shader/hlsl: Handle "unsigned int" type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.l | 3 +- libs/vkd3d-shader/hlsl.y | 21 +++++++++++++ tests/hlsl/unsigned.shader_test | 66 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 7936b988..619bcdf4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -234,6 +234,7 @@ vkd3d_shader_tests = \ tests/hlsl/uav-rwstructuredbuffer.shader_test \ tests/hlsl/uav-rwtexture.shader_test \ tests/hlsl/unbounded-array-5.1.shader_test \ + tests/hlsl/unsigned.shader_test \ tests/hlsl/uniform-parameters.shader_test \ tests/hlsl/uniform-semantics.shader_test \ tests/hlsl/vector-indexing-uniform.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.l b/libs/vkd3d-shader/hlsl.l index a5923d8b..91418775 100644 --- a/libs/vkd3d-shader/hlsl.l +++ b/libs/vkd3d-shader/hlsl.l @@ -49,7 +49,7 @@ static void update_location(struct hlsl_ctx *ctx, YYLTYPE *loc); RESERVED1 auto|catch|char|class|const_cast|delete|dynamic_cast|enum RESERVED2 explicit|friend|goto|long|mutable|new|operator|private|protected|public RESERVED3 reinterpret_cast|short|signed|sizeof|static_cast|template|this|throw|try -RESERVED4 typename|union|unsigned|using|virtual +RESERVED4 typename|union|using|virtual WS [ \t] NEWLINE (\n)|(\r\n) @@ -164,6 +164,7 @@ textureCUBE {return KW_TEXTURECUBE; } TextureCubeArray {return KW_TEXTURECUBEARRAY; } true {return KW_TRUE; } typedef {return KW_TYPEDEF; } +unsigned {return KW_UNSIGNED; } uniform {return KW_UNIFORM; } vector {return KW_VECTOR; } VertexShader {return KW_VERTEXSHADER; } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 9c1bdef9..0b742f12 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -5566,6 +5566,7 @@ static bool state_block_add_entry(struct hlsl_state_block *state_block, struct h %token KW_TEXTURECUBEARRAY %token KW_TRUE %token KW_TYPEDEF +%token KW_UNSIGNED %token KW_UNIFORM %token KW_VECTOR %token KW_VERTEXSHADER @@ -6713,6 +6714,26 @@ type_no_void: } vkd3d_free($1); } + | KW_UNSIGNED TYPE_IDENTIFIER + { + struct hlsl_type *type = hlsl_get_type(ctx->cur_scope, $2, true, true); + + if (hlsl_is_numeric_type(type) && type->e.numeric.type == HLSL_TYPE_INT) + { + if (!(type = hlsl_type_clone(ctx, type, 0, 0))) + YYABORT; + vkd3d_free((void *)type->name); + type->name = NULL; + type->e.numeric.type = HLSL_TYPE_UINT; + } + else + { + hlsl_error(ctx, &@2, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "The 'unsigned' keyword can't be used with type %s.", $2); + } + + $$ = type; + } | KW_STRUCT TYPE_IDENTIFIER { $$ = hlsl_get_type(ctx->cur_scope, $2, true, true); diff --git a/tests/hlsl/unsigned.shader_test b/tests/hlsl/unsigned.shader_test new file mode 100644 index 00000000..8f7aa3dc --- /dev/null +++ b/tests/hlsl/unsigned.shader_test @@ -0,0 +1,66 @@ +[pixel shader] +unsigned int var1; +unsigned int2x2 var2; +unsigned int2 var3; +unsigned int var4[2]; + +typedef int Int; +typedef int2x2 Int2x2; +typedef int2 Int2; + +unsigned Int var5; +unsigned Int2x2 var6; +unsigned Int2 var7; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail(sm<6)] +unsigned uint var; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail(sm<6)] +unsigned uint2 var; + +float4 main() : sv_target +{ + return 0; +} + +[pixel shader fail(sm<6)] +unsigned uint2x2 var; + +float4 main() : sv_target +{ + return 0; +} + +[require] +shader model >= 4.0 + +[pixel shader] +Texture2D<unsigned int> t; + +float4 main() : sv_target +{ + return 0; +} + +[require] +shader model < 6.0 + +[pixel shader fail] +// crashes with dxc +typedef int Int[2]; +unsigned Int var; + +float4 main() : sv_target +{ + return 0; +}

1 0

Alistair Leslie-Hughes : include: Add LOGFONTA/W typedef in shtypes.idl.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: wine Branch: master Commit: 4aed0ef880e341fad73af6291d88ee4fe568e617 URL: https://gitlab.winehq.org/wine/wine/-/commit/4aed0ef880e341fad73af6291d88ee… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 30 07:01:23 2024 +1000 include: Add LOGFONTA/W typedef in shtypes.idl. --- include/shtypes.idl | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/include/shtypes.idl b/include/shtypes.idl index c83562a24bb..41b80789e0e 100644 --- a/include/shtypes.idl +++ b/include/shtypes.idl @@ -182,3 +182,50 @@ typedef [v1_enum] enum DEVICE_SCALE_FACTOR SCALE_450_PERCENT = 450, SCALE_500_PERCENT = 500 } DEVICE_SCALE_FACTOR; + +cpp_quote( "#ifndef LF_FACESIZE") +#define LF_FACESIZE 32 + +typedef struct tagLOGFONTA +{ + LONG lfHeight; + LONG lfWidth; + LONG lfEscapement; + LONG lfOrientation; + LONG lfWeight; + BYTE lfItalic; + BYTE lfUnderline; + BYTE lfStrikeOut; + BYTE lfCharSet; + BYTE lfOutPrecision; + BYTE lfClipPrecision; + BYTE lfQuality; + BYTE lfPitchAndFamily; + CHAR lfFaceName[LF_FACESIZE]; +} LOGFONTA; + +typedef struct tagLOGFONTW +{ + LONG lfHeight; + LONG lfWidth; + LONG lfEscapement; + LONG lfOrientation; + LONG lfWeight; + BYTE lfItalic; + BYTE lfUnderline; + BYTE lfStrikeOut; + BYTE lfCharSet; + BYTE lfOutPrecision; + BYTE lfClipPrecision; + BYTE lfQuality; + BYTE lfPitchAndFamily; + WCHAR lfFaceName[LF_FACESIZE]; +} LOGFONTW; + +#ifdef UNICODE + typedef LOGFONTW LOGFONT; +#else + typedef LOGFONTA LOGFONT; +#endif + +cpp_quote("#endif")

1 0

Alistair Leslie-Hughes : include: Correct IRowsetNotify HROW parameter type.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: wine Branch: master Commit: b6eada5e2f9e3c86c18df118cddd20e6212f64de URL: https://gitlab.winehq.org/wine/wine/-/commit/b6eada5e2f9e3c86c18df118cddd20… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue May 28 08:28:36 2024 +1000 include: Correct IRowsetNotify HROW parameter type. --- dlls/msdaps/usrmarshal.c | 4 ++-- include/rstnot.idl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 10b840b1991..48308c7ee71 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1180,14 +1180,14 @@ HRESULT __RPC_STUB IDBAsynchStatus_GetStatus_Stub(IDBAsynchStatus* This, HCHAPTE return hr; } -HRESULT CALLBACK IRowsetNotify_OnRowChange_Proxy(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, HROW *hrows, DBREASON reason, +HRESULT CALLBACK IRowsetNotify_OnRowChange_Proxy(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, const HROW *hrows, DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) { TRACE("(%p)->(%p %Id %p %ld %ld %d)\n", This, rowset, rows, hrows, reason, phase, cantdeny); return IRowsetNotify_RemoteOnRowChange_Proxy(This, rowset, rows, hrows, reason, phase, cantdeny); } -HRESULT __RPC_STUB IRowsetNotify_OnRowChange_Stub(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, HROW *hrows, DBREASON reason, +HRESULT __RPC_STUB IRowsetNotify_OnRowChange_Stub(IRowsetNotify* This, IRowset *rowset, DBCOUNTITEM rows, const HROW *hrows, DBREASON reason, DBEVENTPHASE phase, BOOL cantdeny) { TRACE("(%p)->(%p %Id %p %ld %ld %d)\n", This, rowset, rows, hrows, reason, phase, cantdeny); diff --git a/include/rstnot.idl b/include/rstnot.idl index 9e6975f9c78..048ac887b4f 100644 --- a/include/rstnot.idl +++ b/include/rstnot.idl @@ -49,7 +49,7 @@ interface IRowsetNotify : IUnknown [local] HRESULT OnRowChange([in] IRowset *rowset, [in] DBCOUNTITEM rows, - [in, size_is((ULONG)rows)] HROW *hrows, + [in, size_is((ULONG)rows)] const HROW *hrows, [in] DBREASON reason, [in] DBEVENTPHASE phase, [in] BOOL cantdeny); @@ -58,7 +58,7 @@ interface IRowsetNotify : IUnknown HRESULT RemoteOnRowChange( [in] IRowset *rowset, [in] DBCOUNTITEM rows, - [in, size_is((ULONG)rows)] HROW *hrows, + [in, size_is((ULONG)rows)] const HROW *hrows, [in] DBREASON reason, [in] DBEVENTPHASE phase, [in] BOOL cantdeny);

1 0

Elizabeth Figura : wined3d: Remove no longer used "exponent" and "cutoff" precomputed fields.
by Alexandre Julliard May 30, 2024

May 30, 2024

Module: wine Branch: master Commit: 8a1448d1d1b05d657de076496a3cf74113cfe735 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a1448d1d1b05d657de076496a3cf7… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Apr 23 18:17:40 2024 -0500 wined3d: Remove no longer used "exponent" and "cutoff" precomputed fields. --- dlls/wined3d/cs.c | 2 -- dlls/wined3d/stateblock.c | 31 ------------------------------- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 35 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index a462f717bdf..958c23d76a7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2070,8 +2070,6 @@ static void wined3d_cs_exec_set_light(struct wined3d_cs *cs, const void *data) light_info->OriginalParms = op->light.OriginalParms; light_info->position = op->light.position; light_info->direction = op->light.direction; - light_info->exponent = op->light.exponent; - light_info->cutoff = op->light.cutoff; } void wined3d_device_context_emit_set_light(struct wined3d_device_context *context, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index ad5753e5d99..6c44733c8bb 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -2325,7 +2325,6 @@ static void wined3d_device_context_set_light(struct wined3d_device_context *cont unsigned int light_idx, const struct wined3d_light *light) { struct wined3d_light_info *object = NULL; - float rho; if (FAILED(wined3d_light_state_set_light(&context->state->light_state, light_idx, light, &object))) return; @@ -2348,7 +2347,6 @@ static void wined3d_device_context_set_light(struct wined3d_device_context *cont object->position.y = light->position.y; object->position.z = light->position.z; object->position.w = 1.0f; - object->cutoff = 180.0f; /* FIXME: Range */ break; @@ -2358,8 +2356,6 @@ static void wined3d_device_context_set_light(struct wined3d_device_context *cont object->direction.y = -light->direction.y; object->direction.z = -light->direction.z; object->direction.w = 0.0f; - object->exponent = 0.0f; - object->cutoff = 180.0f; break; case WINED3D_LIGHT_SPOT: @@ -2375,33 +2371,6 @@ static void wined3d_device_context_set_light(struct wined3d_device_context *cont object->direction.z = light->direction.z; object->direction.w = 0.0f; - /* opengl-ish and d3d-ish spot lights use too different models - * for the light "intensity" as a function of the angle towards - * the main light direction, so we only can approximate very - * roughly. However, spot lights are rather rarely used in games - * (if ever used at all). Furthermore if still used, probably - * nobody pays attention to such details. */ - if (!light->falloff) - { - /* Falloff = 0 is easy, because d3d's and opengl's spot light - * equations have the falloff resp. exponent parameter as an - * exponent, so the spot light lighting will always be 1.0 for - * both of them, and we don't have to care for the rest of the - * rather complex calculation. */ - object->exponent = 0.0f; - } - else - { - rho = light->theta + (light->phi - light->theta) / (2 * light->falloff); - if (rho < 0.0001f) - rho = 0.0001f; - object->exponent = -0.3f / logf(cosf(rho / 2)); - } - - if (object->exponent > 128.0f) - object->exponent = 128.0f; - - object->cutoff = (float)(light->phi * 90 / M_PI); /* FIXME: Range */ break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aaa8dc6472f..3040e40d5e9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2080,8 +2080,6 @@ struct wined3d_light_info /* Converted parms to speed up swapping lights */ struct wined3d_vec4 position; struct wined3d_vec4 direction; - float exponent; - float cutoff; struct rb_entry entry; struct list changed_entry;

1 0