March 2015 - Wine-commits - list.winehq.org

Francois Gouget : toolhelp.dll16: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: d2720f37f16580429bc999853c54babee8da4a75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2720f37f16580429bc999853… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 24 11:41:01 2015 +0100 toolhelp.dll16: Remove unneeded NONAMELESSXXX directives. --- dlls/toolhelp.dll16/toolhelp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/toolhelp.dll16/toolhelp.c b/dlls/toolhelp.dll16/toolhelp.c index 4fa1500..cf5e6ef 100644 --- a/dlls/toolhelp.dll16/toolhelp.c +++ b/dlls/toolhelp.dll16/toolhelp.c @@ -21,8 +21,6 @@ #include "config.h" -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <stdarg.h> #include <stdlib.h> #include <string.h>

1 0

Francois Gouget : twain_32: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: e0d7461d70ab13f98b3c34888031dba1370f11df URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d7461d70ab13f98b3c34888… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 24 11:41:33 2015 +0100 twain_32: Remove unneeded NONAMELESSXXX directives. --- dlls/twain_32/dsm_ctrl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 9bbd0fa..b71c112 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -25,8 +25,6 @@ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "twain.h"

1 0

Francois Gouget : msctf: Mark internal symbols with hidden visibility.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: d21aca41ff3179d2f268a4edfaa6d71959b93cce URL: http://source.winehq.org/git/wine.git/?a=commit;h=d21aca41ff3179d2f268a4edf… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 24 11:41:46 2015 +0100 msctf: Mark internal symbols with hidden visibility. --- dlls/msctf/msctf_internal.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 5dd823f..03370bd 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -65,6 +65,7 @@ extern CLSID get_textservice_clsid(TfClientId tid) DECLSPEC_HIDDEN; extern HRESULT get_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown** sink) DECLSPEC_HIDDEN; extern HRESULT set_textservice_sink(TfClientId tid, REFCLSID iid, IUnknown* sink) DECLSPEC_HIDDEN; -extern const WCHAR szwSystemTIPKey[]; -extern const WCHAR szwSystemCTFKey[]; +extern const WCHAR szwSystemTIPKey[] DECLSPEC_HIDDEN; +extern const WCHAR szwSystemCTFKey[] DECLSPEC_HIDDEN; + #endif /* __WINE_MSCTF_I_H */

1 0

Francois Gouget : msi: Mark internal symbols with hidden visibility.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: f51569626c4041bedc3bd7b8cf305f7a6ae5b10a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f51569626c4041bedc3bd7b8c… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 24 11:43:18 2015 +0100 msi: Mark internal symbols with hidden visibility. --- dlls/msi/msipriv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2b95999..a953d28 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -39,7 +39,7 @@ #include "wine/debug.h" static const BOOL is_64bit = sizeof(void *) > sizeof(int); -BOOL is_wow64; +BOOL is_wow64 DECLSPEC_HIDDEN; #define MSI_DATASIZEMASK 0x00ff #define MSITYPE_VALID 0x0100

1 0

Francois Gouget : msxml3: Mark internal symbols with hidden visibility.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 61652263fa45beda0587812e19ab6a635c9d8e31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61652263fa45beda0587812e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 24 11:43:31 2015 +0100 msxml3: Mark internal symbols with hidden visibility. --- dlls/msxml3/xslpattern.l | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/xslpattern.l b/dlls/msxml3/xslpattern.l index bda3836..58df309 100644 --- a/dlls/msxml3/xslpattern.l +++ b/dlls/msxml3/xslpattern.l @@ -152,6 +152,7 @@ ANY (.) %% +xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr, xmlChar const*) DECLSPEC_HIDDEN; xmlChar* XSLPattern_to_XPath(xmlXPathContextPtr ctxt, xmlChar const* xslpat_str) { parser_param p;

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: baf32ced7428a71d7b59be006b47d6e9eb7f33fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf32ced7428a71d7b59be006… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 24 11:44:08 2015 +0100 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8f8b757..d4483466 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -8264,7 +8264,7 @@ static void test_signed_formats(void) ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x, format %s.\n", hr, formats[i].name); for (y = 0; y < 4; y++) { - memcpy((char *)surface_desc.lpSurface + y * surface_desc.lPitch, + memcpy((char *)surface_desc.lpSurface + y * U1(surface_desc).lPitch, (char *)formats[i].content + y * 4 * formats[i].pixel_size, width * formats[i].pixel_size); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 66f8cff..f3cd495 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -8474,7 +8474,7 @@ static void test_signed_formats(void) ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x, format %s.\n", hr, formats[i].name); for (y = 0; y < 4; y++) { - memcpy((char *)surface_desc.lpSurface + y * surface_desc.lPitch, + memcpy((char *)surface_desc.lpSurface + y * U1(surface_desc).lPitch, (char *)formats[i].content + y * 4 * formats[i].pixel_size, width * formats[i].pixel_size); }

1 0

Stefan Dösinger : wined3d: Improve color fixups in atifs shaders.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 92fee8c04f94893c36543230f45cb38c4fbd486e URL: http://source.winehq.org/git/wine.git/?a=commit;h=92fee8c04f94893c36543230f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 23 18:59:07 2015 +0100 wined3d: Improve color fixups in atifs shaders. The abilities of this hardware is too limited to support generic sign / swizzle fixups. A generic handler would consume 4 of the 8 available color instruction slots and 2 alpha instruction slots. The bump mapping handler code has its own way of handling the color fixups. It merges the fixup into the perturbation calculation without requiring extra shader instructions. In theory this is possible for the majority of d3d texture ops as well, but I don't think this is worth the effort. I expect that this code will only be used for the ddraw signed format test in practice. --- dlls/wined3d/ati_fragment_shader.c | 90 +++++++++++++++++++++++++++++++------- 1 file changed, 75 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 1570a04..8dfb568 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -376,6 +376,69 @@ static GLuint find_tmpreg(const struct texture_stage_op op[MAX_TEXTURES]) } } +static const struct color_fixup_desc color_fixup_rg = +{ + 1, CHANNEL_SOURCE_X, + 1, CHANNEL_SOURCE_Y, + 0, CHANNEL_SOURCE_ONE, + 0, CHANNEL_SOURCE_ONE +}; +static const struct color_fixup_desc color_fixup_rgl = +{ + 1, CHANNEL_SOURCE_X, + 1, CHANNEL_SOURCE_Y, + 0, CHANNEL_SOURCE_Z, + 0, CHANNEL_SOURCE_W +}; +static const struct color_fixup_desc color_fixup_rgba = +{ + 1, CHANNEL_SOURCE_X, + 1, CHANNEL_SOURCE_Y, + 1, CHANNEL_SOURCE_Z, + 1, CHANNEL_SOURCE_W +}; + +static BOOL op_reads_texture(const struct texture_stage_op *op) +{ + return (op->carg0 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE + || (op->carg1 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE + || (op->carg2 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE + || (op->aarg0 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE + || (op->aarg1 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE + || (op->aarg2 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE + || op->cop == WINED3D_TOP_BLEND_TEXTURE_ALPHA; +} + +static void atifs_color_fixup(const struct wined3d_gl_info *gl_info, struct color_fixup_desc fixup, GLuint reg) +{ + if(is_same_fixup(fixup, color_fixup_rg)) + { + wrap_op1(gl_info, GL_MOV_ATI, reg, GL_RED_BIT_ATI | GL_GREEN_BIT_ATI, GL_NONE, + reg, GL_NONE, GL_2X_BIT_ATI | GL_BIAS_BIT_ATI); + wrap_op1(gl_info, GL_MOV_ATI, reg, GL_BLUE_BIT_ATI, GL_NONE, + GL_ONE, GL_NONE, GL_NONE); + wrap_op1(gl_info, GL_MOV_ATI, reg, GL_ALPHA, GL_NONE, + GL_ONE, GL_NONE, GL_NONE); + } + else if(is_same_fixup(fixup, color_fixup_rgl)) + { + wrap_op1(gl_info, GL_MOV_ATI, reg, GL_RED_BIT_ATI | GL_GREEN_BIT_ATI, GL_NONE, + reg, GL_NONE, GL_2X_BIT_ATI | GL_BIAS_BIT_ATI); + } + else if (is_same_fixup(fixup, color_fixup_rgba)) + { + wrap_op1(gl_info, GL_MOV_ATI, reg, GL_NONE, GL_NONE, + reg, GL_NONE, GL_2X_BIT_ATI | GL_BIAS_BIT_ATI); + wrap_op1(gl_info, GL_MOV_ATI, reg, GL_ALPHA, GL_NONE, + reg, GL_NONE, GL_2X_BIT_ATI | GL_BIAS_BIT_ATI); + } + else + { + /* Should not happen - atifs_color_fixup_supported refuses other fixups. */ + ERR("Unsupported color fixup.\n"); + } +} + static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], const struct wined3d_gl_info *gl_info) { GLuint ret = GL_EXTCALL(glGenFragmentShadersATI(1)); @@ -491,13 +554,7 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con swizzle = GL_SWIZZLE_STQ_DQ_ATI; } - if ((op[stage].carg0 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE - || (op[stage].carg1 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE - || (op[stage].carg2 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE - || (op[stage].aarg0 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE - || (op[stage].aarg1 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE - || (op[stage].aarg2 & WINED3DTA_SELECTMASK) == WINED3DTA_TEXTURE - || op[stage].cop == WINED3D_TOP_BLEND_TEXTURE_ALPHA) + if (op_reads_texture(&op[stage])) { if (stage > 0 && (op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP @@ -545,6 +602,12 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con dstreg = GL_REG_0_ATI; } + if (op[stage].cop == WINED3D_TOP_BUMPENVMAP || op[stage].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) + { + /* Those are handled in the first pass of the shader (generation pass 1 and 2) already */ + continue; + } + arg0 = register_for_arg(op[stage].carg0, gl_info, stage, &argmod0, &rep0, tmparg); arg1 = register_for_arg(op[stage].carg1, gl_info, stage, &argmod1, &rep1, tmparg); arg2 = register_for_arg(op[stage].carg2, gl_info, stage, &argmod2, &rep2, tmparg); @@ -552,6 +615,9 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con argmodextra = GL_NONE; extrarg = GL_NONE; + if (op_reads_texture(&op[stage]) && !is_identity_fixup(op[stage].color_fixup)) + atifs_color_fixup(gl_info, op[stage].color_fixup, GL_REG_0_ATI + stage); + switch (op[stage].cop) { case WINED3D_TOP_SELECT_ARG2: @@ -683,11 +749,6 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con arg2, rep2, argmod2); break; - case WINED3D_TOP_BUMPENVMAP: - case WINED3D_TOP_BUMPENVMAP_LUMINANCE: - /* Those are handled in the first pass of the shader(generation pass 1 and 2) already */ - break; - default: FIXME("Unhandled color operation %d on stage %d\n", op[stage].cop, stage); } @@ -1196,9 +1257,8 @@ static BOOL atifs_color_fixup_supported(struct color_fixup_desc fixup) } /* We only support sign fixup of the first two channels. */ - if (fixup.x_source == CHANNEL_SOURCE_X && fixup.y_source == CHANNEL_SOURCE_Y - && fixup.z_source == CHANNEL_SOURCE_Z && fixup.w_source == CHANNEL_SOURCE_W - && !fixup.z_sign_fixup && !fixup.w_sign_fixup) + if (is_identity_fixup(fixup) || is_same_fixup(fixup, color_fixup_rg) + || is_same_fixup(fixup, color_fixup_rgl) || is_same_fixup(fixup, color_fixup_rgba)) { TRACE("[OK]\n"); return TRUE;

1 0

Stefan Dösinger : wined3d: Check for conversion changes in the atifs fragment pipeline.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 1b0c0636322a0eadafcbc8d6ee70e664bc55a418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b0c0636322a0eadafcbc8d6e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 23 18:59:08 2015 +0100 wined3d: Check for conversion changes in the atifs fragment pipeline. Mapping colorop to pixelshader is necessary because misc_state_template defines a pixel shader handler. We have to use the same representative in all pipeline parts. Wined3d_cs_exec_set_texture dirtifies the pixel shader state when the fixup of a texture changes. Atifs no longer needs a pixel shader handler on its own since vertex shader updates aren't delayed any more when the pixel shader state is dirty. --- dlls/wined3d/ati_fragment_shader.c | 165 ++++++++++++++++--------------------- 1 file changed, 73 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b0c0636322a0eadafcbc…

1 0

Stefan Dösinger : wined3d: Add per-context private data for fragment pipelines.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 239e8cad7c01c295f5657cf39f55d255eb0c5044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=239e8cad7c01c295f5657cf39… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 23 18:59:09 2015 +0100 wined3d: Add per-context private data for fragment pipelines. --- dlls/wined3d/arb_program_shader.c | 11 +++++++++++ dlls/wined3d/ati_fragment_shader.c | 11 +++++++++++ dlls/wined3d/context.c | 7 +++++++ dlls/wined3d/glsl_shader.c | 11 +++++++++++ dlls/wined3d/nvidia_texture_shader.c | 14 ++++++++++++++ dlls/wined3d/state.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 3 +++ 7 files changed, 70 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index aa9dc76..747836c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6789,11 +6789,22 @@ static const struct StateEntryTemplate arbfp_fragmentstate_template[] = {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; +static BOOL arbfp_alloc_context_data(struct wined3d_context *context) +{ + return TRUE; +} + +static void arbfp_free_context_data(struct wined3d_context *context) +{ +} + const struct fragment_pipeline arbfp_fragment_pipeline = { arbfp_enable, arbfp_get_caps, arbfp_alloc, arbfp_free, + arbfp_alloc_context_data, + arbfp_free_context_data, shader_arb_color_fixup_supported, arbfp_fragmentstate_template, }; diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index afe7158..ee3e90b 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1249,11 +1249,22 @@ static BOOL atifs_color_fixup_supported(struct color_fixup_desc fixup) return FALSE; } +static BOOL atifs_alloc_context_data(struct wined3d_context *context) +{ + return TRUE; +} + +static void atifs_free_context_data(struct wined3d_context *context) +{ +} + const struct fragment_pipeline atifs_fragment_pipeline = { atifs_enable, atifs_get_caps, atifs_alloc, atifs_free, + atifs_alloc_context_data, + atifs_free_context_data, atifs_color_fixup_supported, atifs_fragmentstate_template, }; diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f875006..1d7cf9c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1447,6 +1447,11 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, ERR("Failed to allocate shader backend context data.\n"); goto out; } + if (!device->adapter->fragment_pipe->allocate_context_data(ret)) + { + ERR("Failed to allocate fragment pipeline context data.\n"); + goto out; + } /* Initialize the texture unit mapping to a 1:1 mapping */ for (s = 0; s < MAX_COMBINED_SAMPLERS; ++s) @@ -1764,6 +1769,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, out: device->shader_backend->shader_free_context_data(ret); + device->adapter->fragment_pipe->free_context_data(ret); HeapFree(GetProcessHeap(), 0, ret->free_event_queries); HeapFree(GetProcessHeap(), 0, ret->free_occlusion_queries); HeapFree(GetProcessHeap(), 0, ret->free_timestamp_queries); @@ -1797,6 +1803,7 @@ void context_destroy(struct wined3d_device *device, struct wined3d_context *cont } device->shader_backend->shader_free_context_data(context); + device->adapter->fragment_pipe->free_context_data(context); HeapFree(GetProcessHeap(), 0, context->draw_buffers); HeapFree(GetProcessHeap(), 0, context->blit_targets); device_context_remove(device, context); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6e3b535..0fa8308 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7539,12 +7539,23 @@ static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = {0 /* Terminate */, {0, 0 }, WINED3D_GL_EXT_NONE }, }; +static BOOL glsl_fragment_pipe_alloc_context_data(struct wined3d_context *context) +{ + return TRUE; +} + +static void glsl_fragment_pipe_free_context_data(struct wined3d_context *context) +{ +} + const struct fragment_pipeline glsl_fragment_pipe = { glsl_fragment_pipe_enable, glsl_fragment_pipe_get_caps, glsl_fragment_pipe_alloc, glsl_fragment_pipe_free, + glsl_fragment_pipe_alloc_context_data, + glsl_fragment_pipe_free_context_data, shader_glsl_color_fixup_supported, glsl_fragment_pipe_state_template, }; diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 136e7f7..516b8af 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -906,11 +906,23 @@ static const struct StateEntryTemplate nvrc_fragmentstate_template[] = {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; +static BOOL nvrc_context_alloc(struct wined3d_context *context) +{ + return TRUE; +} + +static void nvrc_context_free(struct wined3d_context *context) +{ +} + + const struct fragment_pipeline nvts_fragment_pipeline = { nvts_enable, nvrc_fragment_get_caps, nvrc_fragment_alloc, nvrc_fragment_free, + nvrc_context_alloc, + nvrc_context_free, nvts_color_fixup_supported, nvrc_fragmentstate_template, }; @@ -920,6 +932,8 @@ const struct fragment_pipeline nvrc_fragment_pipeline = { nvrc_fragment_get_caps, nvrc_fragment_alloc, nvrc_fragment_free, + nvrc_context_alloc, + nvrc_context_free, nvts_color_fixup_supported, nvrc_fragmentstate_template, }; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4118f69..a949077 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5793,11 +5793,22 @@ static BOOL ffp_color_fixup_supported(struct color_fixup_desc fixup) return FALSE; } +static BOOL ffp_none_context_alloc(struct wined3d_context *context) +{ + return TRUE; +} + +static void ffp_none_context_free(struct wined3d_context *context) +{ +} + const struct fragment_pipeline ffp_fragment_pipeline = { ffp_enable, ffp_fragment_get_caps, ffp_alloc, ffp_free, + ffp_none_context_alloc, + ffp_none_context_free, ffp_color_fixup_supported, ffp_fragmentstate_template, }; @@ -5841,6 +5852,8 @@ const struct fragment_pipeline none_fragment_pipe = fp_none_get_caps, none_alloc, none_free, + ffp_none_context_alloc, + ffp_none_context_free, fp_none_color_fixup_supported, NULL, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 99d7aed..c88f9b1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1190,6 +1190,7 @@ struct wined3d_context GLint aux_buffers; void *shader_backend_data; + void *fragment_pipe_data; /* FBOs */ UINT fbo_entry_count; @@ -1273,6 +1274,8 @@ struct fragment_pipeline void (*get_caps)(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps); void *(*alloc_private)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv); void (*free_private)(struct wined3d_device *device); + BOOL (*allocate_context_data)(struct wined3d_context *context); + void (*free_context_data)(struct wined3d_context *context); BOOL (*color_fixup_supported)(struct color_fixup_desc fixup); const struct StateEntryTemplate *states; };

1 0

Stefan Dösinger : wined3d: Avoid constant collision in atifs.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 3c2d0b983a9ac96bfb2ae01b30bd2e5a3e41bdc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c2d0b983a9ac96bfb2ae01b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 23 18:59:10 2015 +0100 wined3d: Avoid constant collision in atifs. --- dlls/wined3d/ati_fragment_shader.c | 151 ++++++++++++++++++++++++++++--------- 1 file changed, 115 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c2d0b983a9ac96bfb2ae…

1 0