wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Mikolaj Zalewski : move the example config file to config-example. Add config to gitignore
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: f2a87e5e2eced7b66d4824ee112a559dc36fd487 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f2a87e5e2eced7b66d4824ee… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Tue Feb 12 22:03:39 2008 +0100 move the example config file to config-example. Add config to gitignore --- .gitignore | 1 + scripts/Master.sh | 5 +++++ scripts/{config => config-example} | 2 +- 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index 8b8ad77..8485d8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /work/* +/scripts/config /scripts/local-posthook.sh /php/conf /php/dumps diff --git a/scripts/Master.sh b/scripts/Master.sh index 01d97c6..dace16c 100755 --- a/scripts/Master.sh +++ b/scripts/Master.sh @@ -2,6 +2,11 @@ # Main script - change 'config' to setup input/output directories +if [ ! -f ./config ]; then + echo "Config file not found in current directory. Copy config-example to config and edit the configuration" + exit 1 +fi + . ./config function die { diff --git a/scripts/config b/scripts/config-example similarity index 97% rename from scripts/config rename to scripts/config-example index e06f874..b8068dd 100644 --- a/scripts/config +++ b/scripts/config-example @@ -17,4 +17,4 @@ WORKDIR=../work # making the script work even for a just downloaded tree with only ./configure # executed in it. If you are running the script on trees that are already fully # built you may set this to '0' to save time. -PREPARE_TREES=1 \ No newline at end of file +PREPARE_TREES=1

1 0

Mikolaj Zalewski : initial commit
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 13d14a2cacefaf50b42c2b4b9bb48fc0eb3ccc9b URL: http://source.winehq.org/git/tools.git/?a=commit;h=13d14a2cacefaf50b42c2b4b… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Tue Feb 12 21:52:34 2008 +0100 initial commit ---

1 0

Alexandre Julliard : urlmon/tests: Avoid comparing uninitialized structure data.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: 35bc0c798a37fe2283a75b717539a2ac722e47aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=35bc0c798a37fe2283a75b717… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 15:10:17 2009 +0200 urlmon/tests: Avoid comparing uninitialized structure data. --- dlls/urlmon/tests/protocol.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 50820e8..44276b1 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -438,7 +438,14 @@ static HRESULT WINAPI ProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOL ok(pProtocolData != NULL, "pProtocolData == NULL\n"); if(binding_test) { ok(pProtocolData != &protocoldata, "pProtocolData == &protocoldata\n"); - ok(!memcmp(pProtocolData, &protocoldata, sizeof(PROTOCOLDATA)), "*pProtocolData != protocoldata\n"); + ok(pProtocolData->grfFlags == protocoldata.grfFlags, "grfFlags wrong %x/%x\n", + pProtocolData->grfFlags, protocoldata.grfFlags ); + ok(pProtocolData->dwState == protocoldata.dwState, "dwState wrong %x/%x\n", + pProtocolData->dwState, protocoldata.dwState ); + ok(pProtocolData->pData == protocoldata.pData, "pData wrong %p/%p\n", + pProtocolData->pData, protocoldata.pData ); + ok(pProtocolData->cbData == protocoldata.cbData, "cbData wrong %x/%x\n", + pProtocolData->cbData, protocoldata.cbData ); } pdata = pProtocolData; @@ -1327,7 +1334,14 @@ static HRESULT WINAPI ProtocolEmul_Continue(IInternetProtocol *iface, return S_OK; if(binding_test) { ok(pProtocolData != &protocoldata, "pProtocolData == &protocoldata\n"); - ok(!memcmp(pProtocolData, &protocoldata, sizeof(PROTOCOLDATA)), "*pProtocolData != protocoldata\n"); + ok(pProtocolData->grfFlags == protocoldata.grfFlags, "grfFlags wrong %x/%x\n", + pProtocolData->grfFlags, protocoldata.grfFlags ); + ok(pProtocolData->dwState == protocoldata.dwState, "dwState wrong %x/%x\n", + pProtocolData->dwState, protocoldata.dwState ); + ok(pProtocolData->pData == protocoldata.pData, "pData wrong %p/%p\n", + pProtocolData->pData, protocoldata.pData ); + ok(pProtocolData->cbData == protocoldata.cbData, "cbData wrong %x/%x\n", + pProtocolData->cbData, protocoldata.cbData ); } switch(prot_state) {

1 0

Robert Key : wined3d: Add missing HD 3400 renderer string.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: 89b08bc6e2ced8f26913bfb587e7bd0a576cbaee URL: http://source.winehq.org/git/wine.git/?a=commit;h=89b08bc6e2ced8f26913bfb58… Author: Robert Key <hpestilence(a)gmail.com> Date: Thu Jun 18 15:46:02 2009 -0400 wined3d: Add missing HD 3400 renderer string. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f96d101..28f07ef 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1332,7 +1332,8 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { strstr(gl_info->gl_renderer, "HD 2400") || strstr(gl_info->gl_renderer, "HD 3470") || strstr(gl_info->gl_renderer, "HD 3450") || - strstr(gl_info->gl_renderer, "HD 3430")) + strstr(gl_info->gl_renderer, "HD 3430") || + strstr(gl_info->gl_renderer, "HD 3400")) { gl_info->gl_card = CARD_ATI_RADEON_HD2300; vidmem = 128; /* HD2300 uses at least 128MB, HD2400 uses 256MB */

1 0

Nikolay Sivov : comctl32/listview: Add ability to test comctl32 version 6. Add basic LVM_[G, S]ETVIEW test.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: 7bf031ebc48ea2735dfe3d2ad3ad406124c0ed63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bf031ebc48ea2735dfe3d2ad… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jun 19 04:22:28 2009 +0400 comctl32/listview: Add ability to test comctl32 version 6. Add basic LVM_[G,S]ETVIEW test. --- dlls/comctl32/tests/listview.c | 173 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 173 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index f75f858..2c3ab64 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -39,6 +39,40 @@ #define expect2(expected1, expected2, got1, got2) ok(expected1 == got1 && expected2 == got2, \ "expected (%d,%d), got (%d,%d)\n", expected1, expected2, got1, got2) +#ifdef __i386__ +#define ARCH "x86" +#elif defined __x86_64__ +#define ARCH "amd64" +#else +#define ARCH "none" +#endif + +static const CHAR manifest_name[] = "cc6.manifest"; + +static const CHAR manifest[] = + "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" + "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">\n" + " <assemblyIdentity\n" + " type=\"win32\"\n" + " name=\"Wine.ComCtl32.Tests\"\n" + " version=\"1.0.0.0\"\n" + " processorArchitecture=\"" ARCH "\"\n" + " />\n" + "<description>Wine comctl32 test suite</description>\n" + "<dependency>\n" + " <dependentAssembly>\n" + " <assemblyIdentity\n" + " type=\"win32\"\n" + " name=\"microsoft.windows.common-controls\"\n" + " version=\"6.0.0.0\"\n" + " processorArchitecture=\"" ARCH "\"\n" + " publicKeyToken=\"6595b64144ccf1df\"\n" + " language=\"*\"\n" + " />\n" + "</dependentAssembly>\n" + "</dependency>\n" + "</assembly>\n"; + static const WCHAR testparentclassW[] = {'L','i','s','t','v','i','e','w',' ','t','e','s','t',' ','p','a','r','e','n','t','W', 0}; @@ -3374,11 +3408,139 @@ static BOOL is_below_comctl_5(void) return !ret; } +static BOOL load_v6_module(ULONG_PTR *pcookie) +{ + HANDLE hKernel32; + HANDLE (WINAPI *pCreateActCtxA)(ACTCTXA*); + BOOL (WINAPI *pActivateActCtx)(HANDLE, ULONG_PTR*); + + ACTCTXA ctx; + HANDLE hCtx; + BOOL ret; + HANDLE file; + DWORD written; + + hKernel32 = GetModuleHandleA("kernel32.dll"); + pCreateActCtxA = (void*)GetProcAddress(hKernel32, "CreateActCtxA"); + pActivateActCtx = (void*)GetProcAddress(hKernel32, "ActivateActCtx"); + if (!(pCreateActCtxA && pActivateActCtx)) + { + win_skip("Activation contexts unsupported. No version 6 tests possible.\n"); + return FALSE; + } + + /* create manifest */ + file = CreateFileA( manifest_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL ); + if (file != INVALID_HANDLE_VALUE) + { + ret = (WriteFile( file, manifest, sizeof(manifest)-1, &written, NULL ) && + written == sizeof(manifest)-1); + CloseHandle( file ); + if (!ret) + { + DeleteFileA( manifest_name ); + skip("Failed to fill manifest file. Skipping comctl32 V6 tests.\n"); + return FALSE; + } + else + trace("created %s\n", manifest_name); + } + else + { + skip("Failed to create manifest file. Skipping comctl32 V6 tests.\n"); + return FALSE; + } + + memset(&ctx, 0, sizeof(ctx)); + ctx.cbSize = sizeof(ctx); + ctx.lpSource = manifest_name; + + hCtx = pCreateActCtxA(&ctx); + ok(hCtx != 0, "Expected context handle\n"); + + ret = pActivateActCtx(hCtx, pcookie); + expect(TRUE, ret); + + if (!ret) + { + win_skip("A problem during context activation occured.\n"); + DeleteFileA(manifest_name); + } + + return ret; +} + +static void unload_v6_module(ULONG_PTR cookie) +{ + HANDLE hKernel32; + BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); + + hKernel32 = GetModuleHandleA("kernel32.dll"); + pDeactivateActCtx = (void*)GetProcAddress(hKernel32, "DeactivateActCtx"); + if (!pDeactivateActCtx) + { + win_skip("Activation contexts unsupported\n"); + return; + } + + pDeactivateActCtx(0, cookie); + + DeleteFileA(manifest_name); +} + +static void test_get_set_view(void) +{ + HWND hwnd; + DWORD ret; + DWORD_PTR style; + + /* test style->view mapping */ + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + + ret = SendMessage(hwnd, LVM_GETVIEW, 0, 0); + expect(LV_VIEW_DETAILS, ret); + + style = GetWindowLongPtr(hwnd, GWL_STYLE); + /* LVS_ICON == 0 */ + SetWindowLongPtr(hwnd, GWL_STYLE, style & ~LVS_REPORT); + ret = SendMessage(hwnd, LVM_GETVIEW, 0, 0); + expect(LV_VIEW_ICON, ret); + + style = GetWindowLongPtr(hwnd, GWL_STYLE); + SetWindowLongPtr(hwnd, GWL_STYLE, style | LVS_SMALLICON); + ret = SendMessage(hwnd, LVM_GETVIEW, 0, 0); + expect(LV_VIEW_SMALLICON, ret); + + style = GetWindowLongPtr(hwnd, GWL_STYLE); + SetWindowLongPtr(hwnd, GWL_STYLE, (style & ~LVS_SMALLICON) | LVS_LIST); + ret = SendMessage(hwnd, LVM_GETVIEW, 0, 0); + expect(LV_VIEW_LIST, ret); + + /* switching view doesn't touch window style */ + ret = SendMessage(hwnd, LVM_SETVIEW, LV_VIEW_DETAILS, 0); + expect(1, ret); + style = GetWindowLongPtr(hwnd, GWL_STYLE); + ok(style & LVS_LIST, "Expected style to be preserved\n"); + ret = SendMessage(hwnd, LVM_SETVIEW, LV_VIEW_ICON, 0); + expect(1, ret); + style = GetWindowLongPtr(hwnd, GWL_STYLE); + ok(style & LVS_LIST, "Expected style to be preserved\n"); + ret = SendMessage(hwnd, LVM_SETVIEW, LV_VIEW_SMALLICON, 0); + expect(1, ret); + style = GetWindowLongPtr(hwnd, GWL_STYLE); + ok(style & LVS_LIST, "Expected style to be preserved\n"); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); + ULONG_PTR ctx_cookie; + hComctl32 = GetModuleHandleA("comctl32.dll"); pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); if (pInitCommonControlsEx) @@ -3428,5 +3590,16 @@ START_TEST(listview) test_notifyformat(); test_indentation(); + if (!load_v6_module(&ctx_cookie)) + { + DestroyWindow(hwndparent); + return; + } + + /* comctl32 version 6 tests start here */ + test_get_set_view(); + + unload_v6_module(ctx_cookie); + DestroyWindow(hwndparent); }

1 0

Stefan Doesinger : wined3d: Implement EvictManagedResources.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: 0188f96dd2b9f6e32845920f6fb4f73862ef45c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0188f96dd2b9f6e32845920f6… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Tue Jun 9 23:06:06 2009 -0700 wined3d: Implement EvictManagedResources. --- dlls/wined3d/device.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5378568..04a453e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6856,14 +6856,21 @@ static HRESULT WINAPI IWineD3DDeviceImpl_TestCooperativeLevel(IWineD3DDevice* return WINED3DERR_DRIVERINTERNALERROR; } +static HRESULT WINAPI evict_managed_resource(IWineD3DResource *resource, void *data) { + TRACE("checking resource %p for eviction\n", resource); + if(((IWineD3DResourceImpl *) resource)->resource.pool == WINED3DPOOL_MANAGED) { + TRACE("Evicting %p\n", resource); + IWineD3DResource_UnLoad(resource); + } + IWineD3DResource_Release(resource); + return S_OK; +} static HRESULT WINAPI IWineD3DDeviceImpl_EvictManagedResources(IWineD3DDevice* iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - /** FIXME: Resource tracking needs to be done, - * The closes we can do to this is set the priorities of all managed textures low - * and then reset them. - ***********************************************************/ - FIXME("(%p) : stub\n", This); + TRACE("(%p)\n", This); + + IWineD3DDevice_EnumResources(iface, evict_managed_resource, NULL); return WINED3D_OK; }

1 0

Stefan Doesinger : wined3d: Emulate clipplanes in ARB if the NV extensions are not available.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: b2f09fd20421d0a5e179b42332ca63bc5ac17d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f09fd20421d0a5e179b4233… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Wed Jun 17 22:51:34 2009 +0200 wined3d: Emulate clipplanes in ARB if the NV extensions are not available. This patch tries to find a free texture coordinate to load up to 4 clip coordinates into the pixel shader, and uses KIL to throw away fragments that are cut by a clipplane. If no free texture coordinate is found, clipping is not done. If more than 4 clipplanes are used, only the first 4 are actually enabled. That should be pretty rare though. --- dlls/wined3d/arb_program_shader.c | 160 +++++++++++++++++++++++++++++++------ 1 files changed, 136 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b2f09fd20421d0a5e179b…

1 0

Stefan Doesinger : wined3d: Implement vertex texture fetch in ARB.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: 7baf7c65184fd112938475804b7074abe11d234e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7baf7c65184fd112938475804… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Mon Jun 8 15:35:42 2009 -0700 wined3d: Implement vertex texture fetch in ARB. --- dlls/wined3d/arb_program_shader.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8513e4b..aaf83e4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -125,6 +125,11 @@ struct arb_vs_compile_args struct vs_compile_args super; DWORD bools; /* WORD is enough, use DWORD for alignment */ DWORD ps_signature; + union + { + unsigned char vertex_samplers[4]; + DWORD vertex_samplers_compare; + }; unsigned char loop_ctrl[MAX_CONST_I][3]; }; @@ -1089,6 +1094,10 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; const char *mod; + BOOL pshader = shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type); + + /* D3D vertex shader sampler IDs are vertex samplers(0-3), not global d3d samplers */ + if(!pshader) sampler_idx += MAX_FRAGMENT_SAMPLERS; switch(sampler_type) { case WINED3DSTT_1D: @@ -1130,6 +1139,12 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD if(ins->dst[0].modifiers & WINED3DSPDM_SATURATE) mod = "_SAT"; else mod = ""; + /* Fragment samplers always have indentity mapping */ + if(sampler_idx >= MAX_FRAGMENT_SAMPLERS) + { + sampler_idx = priv->cur_vs_args->vertex_samplers[sampler_idx - MAX_FRAGMENT_SAMPLERS]; + } + if (flags & TEX_DERIV) { if(flags & TEX_PROJ) FIXME("Projected texture sampling with custom derivates\n"); @@ -1160,7 +1175,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD shader_addline(buffer, "TEX%s %s, %s, texture[%u], %s;\n", mod, dst_str, coord_reg, sampler_idx, tex_type); } - if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) + if (pshader) { gen_color_correction(buffer, dst_str, ins->dst[0].write_mask, "one", "coefmul.x", priv->cur_ps_args->super.color_fixup[sampler_idx]); @@ -3556,6 +3571,7 @@ static inline BOOL vs_args_equal(const struct arb_vs_compile_args *stored, const if(stored->super.fog_src != new->super.fog_src) return FALSE; if(stored->bools != new->bools) return FALSE; if(stored->ps_signature != new->ps_signature) return FALSE; + if(stored->vertex_samplers_compare != new->vertex_samplers_compare) return FALSE; if(skip_int) return TRUE; return memcmp(stored->loop_ctrl, new->loop_ctrl, sizeof(stored->loop_ctrl)) == 0; @@ -3665,7 +3681,8 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW { int i; WORD int_skip; - const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)shader->baseShader.device)->adapter->gl_info; + IWineD3DDeviceImpl *dev = (IWineD3DDeviceImpl *)shader->baseShader.device; + const WineD3D_GL_Info *gl_info = &dev->adapter->gl_info; find_vs_compile_args(shader, stateblock, &args->super); /* This forces all local boolean constants to 1 to make them stateblock independent */ @@ -3685,6 +3702,11 @@ static inline void find_arb_vs_compile_args(IWineD3DVertexShaderImpl *shader, IW if(stateblock->vertexShaderConstantB[i]) args->bools |= ( 1 << i); } + args->vertex_samplers[0] = dev->texUnitMap[MAX_FRAGMENT_SAMPLERS + 0]; + args->vertex_samplers[1] = dev->texUnitMap[MAX_FRAGMENT_SAMPLERS + 1]; + args->vertex_samplers[2] = dev->texUnitMap[MAX_FRAGMENT_SAMPLERS + 2]; + args->vertex_samplers[3] = 0; + /* Skip if unused or local */ int_skip = ~shader->baseShader.reg_maps.integer_constants | shader->baseShader.reg_maps.local_int_consts; if(int_skip == 0xffff || GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION))

1 0

Stefan Doesinger : wined3d: Don't run out of varyings because of clipplanes .
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: f1e97cdfbc1182fe49bcc231c7d5e6bbd9064ae9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1e97cdfbc1182fe49bcc231c… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Fri Jun 12 19:55:09 2009 -0700 wined3d: Don't run out of varyings because of clipplanes. --- dlls/wined3d/arb_program_shader.c | 37 ++++++++++++++++++++++++++++--------- 1 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 94372da..8513e4b 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -507,7 +507,8 @@ static DWORD *local_const_mapping(IWineD3DBaseShaderImpl *This) /* Generate the variable & register declarations for the ARB_vertex_program output target */ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const shader_reg_maps *reg_maps, - SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_info, DWORD *lconst_map) + SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_info, DWORD *lconst_map, DWORD *num_clipplanes, + struct shader_arb_ctx_priv *ctx) { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; DWORD i, next_local = 0; @@ -530,9 +531,27 @@ static DWORD shader_generate_arb_declarations(IWineD3DBaseShader *iface, const s } else { if(This->baseShader.reg_maps.usesrelconstF) { max_constantsF = GL_LIMITS(vshader_constantsF) - reserved_vs_const(iface, gl_info); - if(GL_SUPPORT(NV_VERTEX_PROGRAM2_OPTION)) max_constantsF -= GL_LIMITS(clipplanes); max_constantsF -= count_bits(This->baseShader.reg_maps.integer_constants); + if(ctx->target_version >= NV2) + { + DWORD highest_constf = 0; + for(i = 0; i < This->baseShader.limits.constant_float; i++) + { + DWORD idx = i >> 5; + DWORD shift = i & 0x1f; + if(reg_maps->constf[idx] & (1 << shift)) highest_constf = i; + } + + *num_clipplanes = min(GL_LIMITS(clipplanes), max_constantsF - highest_constf - 1); + max_constantsF -= *num_clipplanes; + if(*num_clipplanes < GL_LIMITS(clipplanes)) + { + WARN("Only %u clipplanes out of %u enabled\n", *num_clipplanes, GL_LIMITS(clipplanes)); + } + } } else { + if(ctx->target_version >= NV2) *num_clipplanes = GL_LIMITS(clipplanes); + else *num_clipplanes = 0; max_constantsF = GL_LIMITS(vshader_constantsF) - 1; } } @@ -2943,7 +2962,8 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, } /* Base Declarations */ - next_local = shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map); + next_local = shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, + lconst_map, NULL, &priv_ctx); for(i = 0; i < (sizeof(reg_maps->bumpmat) / sizeof(reg_maps->bumpmat[0])); i++) { if(!reg_maps->bumpmat[i]) continue; @@ -3306,6 +3326,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, DWORD next_local, *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); struct shader_arb_ctx_priv priv_ctx; unsigned int i; + DWORD num_clipplanes = 0; memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_vs_args = args; @@ -3342,7 +3363,8 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, shader_addline(buffer, "TEMP TA;\n"); /* Base Declarations */ - next_local = shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, lconst_map); + next_local = shader_generate_arb_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, + lconst_map, &num_clipplanes, &priv_ctx); for(i = 0; i < MAX_CONST_I; i++) { @@ -3419,12 +3441,9 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, shader_addline(buffer, "ADD TMP_OUT.x, TMP_OUT.x, TA.z;\n"); shader_addline(buffer, "MAD TMP_OUT.y, TMP_OUT.y, posFixup.y, TA.w;\n"); - if(priv_ctx.target_version >= NV2) + for(i = 0; i < num_clipplanes; i++) { - for(i = 0; i < GL_LIMITS(clipplanes); i++) - { - shader_addline(buffer, "DP4 result.clip[%u].x, TMP_OUT, state.clip[%u].plane;\n", i, i); - } + shader_addline(buffer, "DP4 result.clip[%u].x, TMP_OUT, state.clip[%u].plane;\n", i, i); } /* Z coord [0;1]->[-1;1] mapping, see comment in transform_projection in state.c

1 0

Stefan Doesinger : wined3d: Handle SM 3.0 varyings in ARB.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: b53b5909ffa6ec35b13f44a8fcb770ce34d10da6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53b5909ffa6ec35b13f44a8f… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Thu Jun 18 13:16:34 2009 +0200 wined3d: Handle SM 3.0 varyings in ARB. --- dlls/wined3d/arb_program_shader.c | 556 ++++++++++++++++++++++++++++++++++--- 1 files changed, 514 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b53b5909ffa6ec35b13f4…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009