wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

André Hentschel : winex11: Fix Ctrl+Tab translation.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: cc688148acef8d636bdaaa4e6ede264657364c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc688148acef8d636bdaaa4e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed May 27 19:55:23 2009 +0200 winex11: Fix Ctrl+Tab translation. --- dlls/user32/tests/input.c | 2 +- dlls/winex11.drv/keyboard.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 2ad3eae..00d344b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1276,7 +1276,7 @@ static void test_ToUnicode(void) state[VK_LCONTROL] |= HIGHEST_BIT; ret = ToUnicode(VK_TAB, SC_TAB, state, wStr, 2, 0); - todo_wine ok(ret == 0, "ToUnicode for CTRL + Tab didn't return 0 (was %i)\n", ret); + ok(ret == 0, "ToUnicode for CTRL + Tab didn't return 0 (was %i)\n", ret); ret = ToUnicode(VK_RETURN, SC_RETURN, state, wStr, 2, 0); ok(ret == 1, "ToUnicode for CTRL + Return didn't return 1 (was %i)\n", ret); diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 80f8445..ad41c84 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2679,7 +2679,8 @@ INT CDECL X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState if (e.state & ControlMask) { if (((keysym>=33) && (keysym < 'A')) || - ((keysym > 'Z') && (keysym < 'a'))) + ((keysym > 'Z') && (keysym < 'a')) || + (keysym == XK_Tab)) { lpChar[0] = 0; ret = 0;

1 0

Peter Hedlund : kernel32: Mask out obsolete flags in GlobalAlloc.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 7d47feaebe2986b426adc21f0dd81e8bd0e86b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d47feaebe2986b426adc21f0… Author: Peter Hedlund <peter(a)peterandlinda.com> Date: Wed May 27 10:27:56 2009 -0700 kernel32: Mask out obsolete flags in GlobalAlloc. --- dlls/kernel32/heap.c | 3 ++ dlls/kernel32/tests/heap.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index c08fb51..c78c762 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -375,6 +375,9 @@ HGLOBAL WINAPI GlobalAlloc( pintern = HeapAlloc(GetProcessHeap(), 0, sizeof(GLOBAL32_INTERN)); if (pintern) { + /* Mask out obsolete flags */ + flags &= ~(GMEM_LOWER | GMEM_NOCOMPACT | GMEM_NOT_BANKED | GMEM_NOTIFY); + pintern->Magic = MAGIC_GLOBAL_USED; pintern->Flags = flags >> 8; pintern->LockCount = 0; diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 39517cc..19b4106 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -362,9 +362,58 @@ static void test_heap(void) GlobalFree(gbl); } +static void test_obsolete_flags(void) +{ + static struct { + UINT flags; + UINT globalflags; + } test_global_flags[] = { + {GMEM_FIXED | GMEM_NOTIFY, 0}, + {GMEM_FIXED | GMEM_DISCARDABLE, 0}, + {GMEM_MOVEABLE | GMEM_NOTIFY, 0}, + {GMEM_MOVEABLE | GMEM_DDESHARE, GMEM_DDESHARE}, + {GMEM_MOVEABLE | GMEM_NOT_BANKED, 0}, + {GMEM_MOVEABLE | GMEM_NODISCARD, 0}, + {GMEM_MOVEABLE | GMEM_DISCARDABLE, GMEM_DISCARDABLE}, + {GMEM_MOVEABLE | GMEM_DDESHARE | GMEM_DISCARDABLE | GMEM_LOWER | GMEM_NOCOMPACT | GMEM_NODISCARD | + GMEM_NOT_BANKED | GMEM_NOTIFY, GMEM_DDESHARE | GMEM_DISCARDABLE}, + }; + + unsigned int i; + HGLOBAL gbl; + UINT resultflags; + + UINT (WINAPI *pGlobalFlags)(HGLOBAL); + + pGlobalFlags = (void *) GetProcAddress(GetModuleHandleA("kernel32"), "GlobalFlags"); + + if (!pGlobalFlags) + { + win_skip("GlobalFlags is not available\n"); + return; + } + + for (i = 0; i < sizeof(test_global_flags)/sizeof(test_global_flags[0]); i++) + { + gbl = GlobalAlloc(test_global_flags[i].flags, 4); + ok(gbl != NULL, "GlobalAlloc failed\n"); + + SetLastError(MAGIC_DEAD); + resultflags = pGlobalFlags(gbl); + + ok( resultflags == test_global_flags[i].globalflags || + broken(resultflags == (test_global_flags[i].globalflags & ~GMEM_DDESHARE)), /* win9x */ + "%u: expected 0x%08x, but returned 0x%08x with %d\n", + i, test_global_flags[i].globalflags, resultflags, GetLastError() ); + + GlobalFree(gbl); + } +} + START_TEST(heap) { test_heap(); + test_obsolete_flags(); /* Test both short and very long blocks */ test_sized_HeapAlloc(1);

1 0

Stefan Dösinger : wined3d: Emulate if(bool) in ARB shaders.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: e70c80add9942bab844e6db8a3a4ddbca6576762 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e70c80add9942bab844e6db8a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 27 18:23:59 2009 +0200 wined3d: Emulate if(bool) in ARB shaders. --- dlls/wined3d/arb_program_shader.c | 203 ++++++++++++++++++++++++++++++++----- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 180 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e70c80add9942bab844e6…

1 0

Stefan Dösinger : wined3d: Add a function around the handler table.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: e492dd858e9ef8edbae5fbe90ba63e1def6ddcd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e492dd858e9ef8edbae5fbe90… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed May 27 18:23:16 2009 +0200 wined3d: Add a function around the handler table. This reduces the number of methods in the shader backend(the instr modifiers can be handled in that wrapper) and it will help flow control emulation in the ARB backend. --- dlls/wined3d/arb_program_shader.c | 20 ++++++++++++++++++-- dlls/wined3d/baseshader.c | 24 +++--------------------- dlls/wined3d/glsl_shader.c | 20 ++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 40 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index dd74b25..a48925f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2666,8 +2666,25 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXREG2RGB */ pshader_hw_texreg2rgb, }; +static void shader_arb_handle_instruction(const struct wined3d_shader_instruction *ins) { + SHADER_HANDLER hw_fct; + + /* Select handler */ + hw_fct = shader_arb_instruction_handler_table[ins->handler_idx]; + + /* Unhandled opcode */ + if (!hw_fct) + { + FIXME("Backend can't handle opcode %#x\n", ins->handler_idx); + return; + } + hw_fct(ins); + + shader_arb_add_instruction_modifiers(ins); +} + const shader_backend_t arb_program_shader_backend = { - shader_arb_instruction_handler_table, + shader_arb_handle_instruction, shader_arb_select, shader_arb_select_depth_blt, shader_arb_deselect_depth_blt, @@ -2681,7 +2698,6 @@ const shader_backend_t arb_program_shader_backend = { shader_arb_dirty_const, shader_arb_get_caps, shader_arb_color_fixup_supported, - shader_arb_add_instruction_modifiers, }; /* ARB_fragment_program fixed function pipeline replacement definitions */ diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 0380c33..431b9a2 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -986,7 +986,6 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, { IWineD3DBaseShaderImpl* This = (IWineD3DBaseShaderImpl*) iface; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; /* To access shader backend callbacks */ - const SHADER_HANDLER *handler_table = device->shader_backend->shader_instruction_handler_table; const struct wined3d_shader_frontend *fe = This->baseShader.frontend; void *fe_data = This->baseShader.frontend_data; struct wined3d_shader_src_param src_rel_addr[4]; @@ -997,7 +996,6 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, struct wined3d_shader_instruction ins; struct wined3d_shader_context ctx; const DWORD *pToken = pFunction; - SHADER_HANDLER hw_fct; DWORD i; /* Initialize current parsing state */ @@ -1046,17 +1044,6 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, continue; } - /* Select handler */ - hw_fct = handler_table[ins.handler_idx]; - - /* Unhandled opcode */ - if (!hw_fct) - { - FIXME("Backend can't handle opcode %#x\n", ins.handler_idx); - pToken += param_size; - continue; - } - /* Destination token */ if (ins.dst_count) fe->shader_read_dst_param(fe_data, &pToken, &dst_param, &dst_rel_addr); @@ -1070,10 +1057,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER *buffer, } /* Call appropriate function for output target */ - hw_fct(&ins); - - /* Process instruction modifiers for GLSL apps ( _sat, etc. ) */ - device->shader_backend->shader_add_instruction_modifiers(&ins); + device->shader_backend->shader_handle_instruction(&ins); } } @@ -1271,7 +1255,7 @@ void shader_cleanup(IWineD3DBaseShader *iface) } } -static const SHADER_HANDLER shader_none_instruction_handler_table[WINED3DSIH_TABLE_SIZE] = {0}; +static void shader_none_handle_instruction(const struct wined3d_shader_instruction *ins) {} static void shader_none_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) {} static void shader_none_select_depth_blt(IWineD3DDevice *iface, enum tex_types tex_type) {} static void shader_none_deselect_depth_blt(IWineD3DDevice *iface) {} @@ -1283,7 +1267,6 @@ static void shader_none_destroy(IWineD3DBaseShader *iface) {} static HRESULT shader_none_alloc(IWineD3DDevice *iface) {return WINED3D_OK;} static void shader_none_free(IWineD3DDevice *iface) {} static BOOL shader_none_dirty_const(IWineD3DDevice *iface) {return FALSE;} -static void shader_none_add_instruction_modifiers(const struct wined3d_shader_instruction *ins) {} #define GLINFO_LOCATION (*gl_info) static void shader_none_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *gl_info, struct shader_caps *pCaps) @@ -1314,7 +1297,7 @@ static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup) } const shader_backend_t none_shader_backend = { - shader_none_instruction_handler_table, + shader_none_handle_instruction, shader_none_select, shader_none_select_depth_blt, shader_none_deselect_depth_blt, @@ -1328,5 +1311,4 @@ const shader_backend_t none_shader_backend = { shader_none_dirty_const, shader_none_get_caps, shader_none_color_fixup_supported, - shader_none_add_instruction_modifiers, }; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0b20d33..08bcaa6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4656,8 +4656,25 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2RGB */ pshader_glsl_texreg2rgb, }; +static void shader_glsl_handle_instruction(const struct wined3d_shader_instruction *ins) { + SHADER_HANDLER hw_fct; + + /* Select handler */ + hw_fct = shader_glsl_instruction_handler_table[ins->handler_idx]; + + /* Unhandled opcode */ + if (!hw_fct) + { + FIXME("Backend can't handle opcode %#x\n", ins->handler_idx); + return; + } + hw_fct(ins); + + shader_glsl_add_instruction_modifiers(ins); +} + const shader_backend_t glsl_shader_backend = { - shader_glsl_instruction_handler_table, + shader_glsl_handle_instruction, shader_glsl_select, shader_glsl_select_depth_blt, shader_glsl_deselect_depth_blt, @@ -4671,5 +4688,4 @@ const shader_backend_t glsl_shader_backend = { shader_glsl_dirty_const, shader_glsl_get_caps, shader_glsl_color_fixup_supported, - shader_glsl_add_instruction_modifiers, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce6fd40..1b4906a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -797,7 +797,7 @@ struct vs_compile_args { }; typedef struct { - const SHADER_HANDLER *shader_instruction_handler_table; + void (*shader_handle_instruction)(const struct wined3d_shader_instruction *); void (*shader_select)(IWineD3DDevice *iface, BOOL usePS, BOOL useVS); void (*shader_select_depth_blt)(IWineD3DDevice *iface, enum tex_types tex_type); void (*shader_deselect_depth_blt)(IWineD3DDevice *iface);

1 0

Stefan Dösinger : wined3d: Manage vs_compile_args in the backends.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: aad92c0780f7a0383db1736d6fbca6a8ce6b45ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad92c0780f7a0383db1736d6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 21:06:37 2009 +0200 wined3d: Manage vs_compile_args in the backends. --- dlls/wined3d/arb_program_shader.c | 63 ++++++++++++++++++++----------- dlls/wined3d/glsl_shader.c | 74 +++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 9 +---- 3 files changed, 91 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aad92c0780f7a0383db17…

1 0

Stefan Dösinger : wined3d: Manage ps_compiled_shader in the backends.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 814dd42f256eaa2fe6caf2c78ffdff1f9af138bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=814dd42f256eaa2fe6caf2c78… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 21:05:59 2009 +0200 wined3d: Manage ps_compiled_shader in the backends. --- dlls/wined3d/arb_program_shader.c | 64 ++++++++++++++++++++----------- dlls/wined3d/glsl_shader.c | 76 +++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 8 +--- 3 files changed, 94 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=814dd42f256eaa2fe6caf…

1 0

Stefan Dösinger : wined3d: Make find_gl_vshader backend specific.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 8763f6eac549be7f458cb579e2308bf11fa958dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8763f6eac549be7f458cb579e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 14:10:56 2009 +0200 wined3d: Make find_gl_vshader backend specific. --- dlls/wined3d/arb_program_shader.c | 70 ++++++++++++++++++++++++++++++++---- dlls/wined3d/baseshader.c | 7 ---- dlls/wined3d/glsl_shader.c | 70 ++++++++++++++++++++++++++++++++----- dlls/wined3d/vertexshader.c | 65 ---------------------------------- dlls/wined3d/wined3d_private.h | 3 -- 5 files changed, 123 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8763f6eac549be7f458cb…

1 0

Stefan Dösinger : wined3d: Remove the forward declaration added in the last patch.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 732a9a15d59680e21897502e9afe2b3fefa6428b URL: http://source.winehq.org/git/wine.git/?a=commit;h=732a9a15d59680e21897502e9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 13:57:03 2009 +0200 wined3d: Remove the forward declaration added in the last patch. --- dlls/wined3d/arb_program_shader.c | 450 ++++++++++++++++++------------------- dlls/wined3d/glsl_shader.c | 358 +++++++++++++++--------------- 2 files changed, 401 insertions(+), 407 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=732a9a15d59680e218975…

1 0

Stefan Dösinger : wined3d: Make find_gl_pshader backend private.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: d0d681c81ef537ae3e8d0a6cc67310758b9f63f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d681c81ef537ae3e8d0a6cc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 13:43:43 2009 +0200 wined3d: Make find_gl_pshader backend private. --- dlls/wined3d/arb_program_shader.c | 59 +++++++++++++++++++++++++++++++-- dlls/wined3d/baseshader.c | 7 ---- dlls/wined3d/glsl_shader.c | 55 +++++++++++++++++++++++++++++- dlls/wined3d/pixelshader.c | 66 +------------------------------------ dlls/wined3d/wined3d_private.h | 4 +-- 5 files changed, 111 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d0d681c81ef537ae3e8d0…

1 0

Stefan Dösinger : wined3d: Store the compile args in the compile context, not the shader.
by Alexandre Julliard 28 May '09

28 May '09

Module: wine Branch: master Commit: 5865d9c01b2aed1ed7a2f5987f587de952cb2ad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5865d9c01b2aed1ed7a2f5987… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 26 13:27:54 2009 +0200 wined3d: Store the compile args in the compile context, not the shader. --- dlls/wined3d/arb_program_shader.c | 21 +++++++++++++-------- dlls/wined3d/glsl_shader.c | 26 ++++++++++++++++++++------ dlls/wined3d/pixelshader.c | 2 -- dlls/wined3d/vertexshader.c | 2 -- dlls/wined3d/wined3d_private.h | 4 ---- 5 files changed, 33 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4ace13b..db19fe5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -93,6 +93,9 @@ struct shader_arb_ctx_priv { /* GL_NV_vertex_program3 or GL_NV_fragment_program2 */ NV3 } target_version; + + const struct vs_compile_args *cur_vs_args; + const struct ps_compile_args *cur_ps_args; }; /******************************************************** @@ -543,7 +546,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction } else { - if (((IWineD3DVertexShaderImpl *)This)->cur_args->swizzle_map & (1 << reg->idx)) *is_color = TRUE; + if (ctx->cur_vs_args->swizzle_map & (1 << reg->idx)) *is_color = TRUE; sprintf(register_name, "vertex.attrib[%u]", reg->idx); } break; @@ -606,7 +609,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction case WINED3DSPR_COLOROUT: if (reg->idx == 0) { - if(((IWineD3DPixelShaderImpl *)This)->cur_args->srgb_correction) + if(ctx->cur_ps_args->srgb_correction) { strcpy(register_name, "TMP_COLOR"); } @@ -739,6 +742,7 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD const char *tex_type; IWineD3DBaseShaderImpl *This = (IWineD3DBaseShaderImpl *)ins->ctx->shader; IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) This->baseShader.device; + struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; switch(sampler_type) { case WINED3DSTT_1D: @@ -754,10 +758,10 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD } if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { - const IWineD3DPixelShaderImpl* const ps = (const IWineD3DPixelShaderImpl*)This; - if(ps->cur_args->np2_fixup & (1 << sampler_idx)) { - FIXME("NP2 texcoord fixup is currently not implemented in ARB mode (use GLSL instead).\n"); - } + if(priv->cur_ps_args->np2_fixup & (1 << sampler_idx)) + { + FIXME("NP2 texcoord fixup is currently not implemented in ARB mode (use GLSL instead).\n"); + } } break; @@ -787,9 +791,8 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { - IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *)ins->ctx->shader; gen_color_correction(buffer, dst_str, ins->dst[0].write_mask, - "one", "coefmul.x", ps->cur_args->color_fixup[sampler_idx]); + "one", "coefmul.x", priv->cur_ps_args->color_fixup[sampler_idx]); } } @@ -2128,6 +2131,7 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShader *iface, /* Create the hw ARB shader */ memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.cur_ps_args = args; shader_addline(buffer, "!!ARBfp1.0\n"); if(GL_SUPPORT(NV_FRAGMENT_PROGRAM_OPTION)) { shader_addline(buffer, "OPTION NV_fragment_program;\n"); @@ -2240,6 +2244,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShader *iface, struct shader_arb_ctx_priv priv_ctx; memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.cur_vs_args = args; /* Create the hw ARB shader */ shader_addline(buffer, "!!ARBvp1.0\n"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f576e67..8eaffe8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -122,6 +122,11 @@ typedef struct { struct vs_compile_args vs_args; } glsl_program_key_t; +struct shader_glsl_ctx_priv { + const struct vs_compile_args *cur_vs_args; + const struct ps_compile_args *cur_ps_args; +}; + /* Extract a line from the info log. * Note that this modifies the source string. */ static char *get_info_log_line(char **ptr) @@ -1123,7 +1128,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * /* vertex shaders */ if (!pshader) { - if (((IWineD3DVertexShaderImpl *)This)->cur_args->swizzle_map & (1 << reg->idx)) *is_color = TRUE; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + if (priv->cur_vs_args->swizzle_map & (1 << reg->idx)) *is_color = TRUE; sprintf(register_name, "attrib%u", reg->idx); break; } @@ -1657,11 +1663,11 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { - IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)ins->ctx->shader; - fixup = This->cur_args->color_fixup[sampler]; + struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; + fixup = priv->cur_ps_args->color_fixup[sampler]; sampler_base = "Psampler"; - if(This->cur_args->np2_fixup & (1 << sampler)) { + if(priv->cur_ps_args->np2_fixup & (1 << sampler)) { if(bias) { FIXME("Biased sampling from NP2 textures is unsupported\n"); } else { @@ -4164,10 +4170,14 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, CONST DWORD *function = This->baseShader.function; const char *fragcolor; const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info; + struct shader_glsl_ctx_priv priv_ctx; /* Create the hw GLSL shader object and assign it as the shader->prgId */ GLhandleARB shader_obj = GL_EXTCALL(glCreateShaderObjectARB(GL_FRAGMENT_SHADER_ARB)); + memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.cur_ps_args = args; + shader_addline(buffer, "#version 120\n"); if (GL_SUPPORT(ARB_DRAW_BUFFERS)) { @@ -4193,7 +4203,7 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShader *iface, } /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, NULL); + shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); /* Pixel shaders < 2.0 place the resulting color in R0 implicitly */ if (reg_maps->shader_version.major < 2) @@ -4270,17 +4280,21 @@ static GLuint shader_glsl_generate_vshader(IWineD3DVertexShader *iface, const struct shader_reg_maps *reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info; + struct shader_glsl_ctx_priv priv_ctx; /* Create the hw GLSL shader program and assign it as the shader->prgId */ GLhandleARB shader_obj = GL_EXTCALL(glCreateShaderObjectARB(GL_VERTEX_SHADER_ARB)); shader_addline(buffer, "#version 120\n"); + memset(&priv_ctx, 0, sizeof(priv_ctx)); + priv_ctx.cur_vs_args = args; + /* Base Declarations */ shader_generate_glsl_declarations( (IWineD3DBaseShader*) This, reg_maps, buffer, &GLINFO_LOCATION, NULL); /* Base Shader Body */ - shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function, NULL); + shader_generate_main((IWineD3DBaseShader*)This, buffer, reg_maps, function, &priv_ctx); /* Unpack 3.0 outputs */ if (reg_maps->shader_version.major >= 3) shader_addline(buffer, "order_ps_input(OUT);\n"); diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index 839b9bb..f1966a1 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -358,11 +358,9 @@ static GLuint pixelshader_compile(IWineD3DPixelShaderImpl *This, const struct ps /* Generate the HW shader */ TRACE("(%p) : Generating hardware program\n", This); - This->cur_args = args; shader_buffer_init(&buffer); retval = device->shader_backend->shader_generate_pshader((IWineD3DPixelShader *)This, &buffer, args); shader_buffer_free(&buffer); - This->cur_args = NULL; return retval; } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 99108a8..9ae52f9 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -341,9 +341,7 @@ static GLuint vertexshader_compile(IWineD3DVertexShaderImpl *This, const struct /* Generate the HW shader */ TRACE("(%p) : Generating hardware program\n", This); shader_buffer_init(&buffer); - This->cur_args = args; ret = deviceImpl->shader_backend->shader_generate_vshader((IWineD3DVertexShader *)This, &buffer, args); - This->cur_args = NULL; shader_buffer_free(&buffer); return ret; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1698504..c830d35 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2687,8 +2687,6 @@ typedef struct IWineD3DVertexShaderImpl { UINT rel_offset; UINT recompile_count; - - const struct vs_compile_args *cur_args; } IWineD3DVertexShaderImpl; extern const IWineD3DVertexShaderVtbl IWineD3DVertexShader_Vtbl; @@ -2728,8 +2726,6 @@ typedef struct IWineD3DPixelShaderImpl { unsigned char numbumpenvmatconsts; struct stb_const_desc luminanceconst[MAX_TEXTURES]; char vpos_uniform; - - const struct ps_compile_args *cur_args; } IWineD3DPixelShaderImpl; extern const IWineD3DPixelShaderVtbl IWineD3DPixelShader_Vtbl;

1 0

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

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 May 2009