April 2016 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Recognize SM5 dcl_tessellator_domain opcode.
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: e1a870c6ab826ef28340deca3647ace27795246a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a870c6ab826ef28340deca3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 1 11:21:37 2016 +0200 wined3d: Recognize SM5 dcl_tessellator_domain opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 10 ++++++++++ dlls/wined3d/wined3d_private.h | 9 +++++++++ 5 files changed, 47 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1800f94..1cb4d20 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5248,6 +5248,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ NULL, /* WINED3DSIH_DCL_SAMPLER */ NULL, /* WINED3DSIH_DCL_TEMPS */ NULL, + /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, /* WINED3DSIH_DEF */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dbb0956..ce1b1f4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8162,6 +8162,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ NULL, /* WINED3DSIH_DCL_SAMPLER */ shader_glsl_nop, /* WINED3DSIH_DCL_TEMPS */ shader_glsl_nop, + /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0aa77b0..ec45dd8 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -74,6 +74,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ "dcl_resource_structured", /* WINED3DSIH_DCL_SAMPLER */ "dcl_sampler", /* WINED3DSIH_DCL_TEMPS */ "dcl_temps", + /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ "dcl_tessellator_domain", /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", @@ -1297,6 +1298,26 @@ static void shader_dump_global_flags(struct wined3d_string_buffer *buffer, DWORD shader_addline(buffer, "unknown_flags(%#x)", global_flags); } +static void shader_dump_tessellator_domain(struct wined3d_string_buffer *buffer, + enum wined3d_tessellator_domain domain) +{ + switch (domain) + { + case WINED3D_TESSELLATOR_DOMAIN_LINE: + shader_addline(buffer, "line"); + break; + case WINED3D_TESSELLATOR_DOMAIN_TRIANGLE: + shader_addline(buffer, "triangle"); + break; + case WINED3D_TESSELLATOR_DOMAIN_QUAD: + shader_addline(buffer, "quad"); + break; + default: + shader_addline(buffer, "unknown_tessellator_domain(%#x)", domain); + break; + } +} + static void shader_dump_sysval_semantic(struct wined3d_string_buffer *buffer, enum wined3d_sysval_semantic semantic) { unsigned int i; @@ -2093,6 +2114,11 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe { shader_addline(&buffer, "%s %u", shader_opcode_names[ins.handler_idx], ins.declaration.count); } + else if (ins.handler_idx == WINED3DSIH_DCL_TESSELLATOR_DOMAIN) + { + shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); + shader_dump_tessellator_domain(&buffer, ins.declaration.tessellator_domain); + } else if (ins.handler_idx == WINED3DSIH_DEF) { shader_addline(&buffer, "def c%u = %.8e, %.8e, %.8e, %.8e", shader_get_float_offset(ins.dst[0].reg.type, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 26bd353..936b84b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -64,6 +64,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT 11 #define WINED3D_SM5_CONTROL_POINT_COUNT_MASK (0xffu << WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT) +#define WINED3D_SM5_TESSELLATOR_DOMAIN_SHIFT 11 +#define WINED3D_SM5_TESSELLATOR_DOMAIN_MASK (0xfu << WINED3D_SM5_TESSELLATOR_DOMAIN_SHIFT) + #define WINED3D_SM4_OPCODE_MASK 0xff #define WINED3D_SM4_REGISTER_MODIFIER (0x1u << 31) @@ -195,6 +198,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT = 0x94, + WINED3D_SM5_OP_DCL_TESSELLATOR_DOMAIN = 0x95, WINED3D_SM5_OP_DCL_HS_MAX_TESSFACTOR = 0x98, WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, @@ -414,6 +418,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", ""}, {WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT, "", ""}, + {WINED3D_SM5_OP_DCL_TESSELLATOR_DOMAIN, WINED3DSIH_DCL_TESSELLATOR_DOMAIN, "", ""}, {WINED3D_SM5_OP_DCL_HS_MAX_TESSFACTOR, WINED3DSIH_DCL_HS_MAX_TESSFACTOR, "", ""}, {WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, "", ""}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", ""}, @@ -1039,6 +1044,11 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi FIXME("Unhandled sampler mode %#x.\n", ins->flags); shader_sm4_read_dst_param(priv, &p, WINED3D_DATA_SAMPLER, &ins->declaration.dst); } + else if (opcode == WINED3D_SM5_OP_DCL_TESSELLATOR_DOMAIN) + { + ins->declaration.tessellator_domain = (opcode_token & WINED3D_SM5_TESSELLATOR_DOMAIN_MASK) + >> WINED3D_SM5_TESSELLATOR_DOMAIN_SHIFT; + } else if (opcode == WINED3D_SM4_OP_DCL_OUTPUT_TOPOLOGY) { enum wined3d_sm4_output_primitive_type primitive_type; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e56689b..7f3f18e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -439,6 +439,13 @@ enum wined3d_shader_global_flags WINED3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS = 0x8, }; +enum wined3d_tessellator_domain +{ + WINED3D_TESSELLATOR_DOMAIN_LINE = 1, + WINED3D_TESSELLATOR_DOMAIN_TRIANGLE = 2, + WINED3D_TESSELLATOR_DOMAIN_QUAD = 3, +}; + /* Undocumented opcode control to identify projective texture lookups in ps 2.0 and later */ #define WINED3DSI_TEXLD_PROJECT 0x1 #define WINED3DSI_TEXLD_BIAS 0x2 @@ -531,6 +538,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_SAMPLER, WINED3DSIH_DCL_TEMPS, + WINED3DSIH_DCL_TESSELLATOR_DOMAIN, WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF, @@ -857,6 +865,7 @@ struct wined3d_shader_instruction UINT count; const struct wined3d_shader_immediate_constant_buffer *icb; struct wined3d_shader_structured_resource structured_resource; + enum wined3d_tessellator_domain tessellator_domain; float max_tessellation_factor; } declaration; };

1 0

Jacek Caban : mshtml: Added IHTMLDivElement declaration.
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: 8cba37944cf9992b18227ecdb5bd322e5bce74f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cba37944cf9992b18227ecdb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 1 13:48:18 2016 +0200 mshtml: Added IHTMLDivElement declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 4 ++++ include/mshtml.idl | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index ac0a5e2..a596477 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2993,6 +2993,10 @@ /* IHTMLScriptElement3 */ #define DISPID_IHTMLSCRIPTELEMENT3_IE8_SRC DISPID_IE8_SCRIPT +/* IHTMLDivElement */ +#define DISPID_IHTMLDIVELEMENT_ALIGN STDPROPID_XOBJ_BLOCKALIGN +#define DISPID_IHTMLDIVELEMENT_NOWRAP DISPID_A_NOWRAP + /* IHTMLObjectElement */ #define DISPID_IHTMLOBJECTELEMENT_OBJECT DISPID_OBJECT+1 #define DISPID_IHTMLOBJECTELEMENT_CLASSID DISPID_OBJECT+2 diff --git a/include/mshtml.idl b/include/mshtml.idl index e068912..53dc4bc 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -17841,6 +17841,56 @@ interface IHTMLObjectElement2 : IDispatch } /***************************************************************************** + * IHTMLDivElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f200-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLDivElement : IDispatch +{ + [propput, id(DISPID_IHTMLDIVELEMENT_ALIGN), displaybind, bindable] + HRESULT align([in] BSTR v); + + [propget, id(DISPID_IHTMLDIVELEMENT_ALIGN), displaybind, bindable] + HRESULT align([out, retval] BSTR *p); + + [propput, id(DISPID_IHTMLDIVELEMENT_NOWRAP), displaybind, bindable] + HRESULT noWrap([in] VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLDIVELEMENT_NOWRAP), displaybind, bindable] + HRESULT noWrap([out, retval] VARIANT_BOOL *p); +} + +/***************************************************************************** + * DispHTMLDivElement dispinterface + */ +[ + hidden, + uuid(3050f50c-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLDivElement +{ +properties: +methods: + WINE_HTMLELEMENT_DISPINTERFACE_DECL; + + [propput, id(DISPID_IHTMLDIVELEMENT_ALIGN), displaybind, bindable] + void align(BSTR v); + + [propget, id(DISPID_IHTMLDIVELEMENT_ALIGN), displaybind, bindable] + BSTR align(); + + [propput, id(DISPID_IHTMLDIVELEMENT_NOWRAP), displaybind, bindable] + void noWrap(VARIANT_BOOL v); + + [propget, id(DISPID_IHTMLDIVELEMENT_NOWRAP), displaybind, bindable] + VARIANT_BOOL noWrap(); +} + +/***************************************************************************** * IHTMLParamElement interface */ [

1 0

Alistair Leslie-Hughes : include: Add d3dx10tex.h.
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: 9adddbafe5eb29851e827e80f13428ff10a1d716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9adddbafe5eb29851e827e80f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 31 20:19:43 2016 +1100 include: Add d3dx10tex.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/d3dx10.h | 1 + include/d3dx10tex.h | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 6e9803c..ac10691 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -253,6 +253,7 @@ HEADER_SRCS = \ d3dvec.inl \ d3dx10.h \ d3dx10async.h \ + d3dx10tex.h \ d3dx9.h \ d3dx9anim.h \ d3dx9core.h \ diff --git a/include/d3dx10.h b/include/d3dx10.h index df7cdb1..dd423a5 100644 --- a/include/d3dx10.h +++ b/include/d3dx10.h @@ -29,5 +29,6 @@ #include "d3d10.h" #include "d3dx10core.h" #include "d3dx10async.h" +#include "d3dx10tex.h" #endif diff --git a/include/d3dx10tex.h b/include/d3dx10tex.h new file mode 100644 index 0000000..aa89ab4 --- /dev/null +++ b/include/d3dx10tex.h @@ -0,0 +1,95 @@ +/* + * Copyright 2016 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __D3DX10TEX_H__ +#define __D3DX10TEX_H__ + +typedef enum D3DX10_IMAGE_FILE_FORMAT +{ + D3DX10_IFF_BMP = 0, + D3DX10_IFF_JPG = 1, + D3DX10_IFF_PNG = 3, + D3DX10_IFF_DDS = 4, + D3DX10_IFF_TIFF = 10, + D3DX10_IFF_GIF = 11, + D3DX10_IFF_WMP = 12, + D3DX10_IFF_FORCE_DWORD = 0x7fffffff +} D3DX10_IMAGE_FILE_FORMAT; + +typedef struct D3DX10_IMAGE_INFO +{ + UINT Width; + UINT Height; + UINT Depth; + UINT ArraySize; + UINT MipLevels; + UINT MiscFlags; + DXGI_FORMAT Format; + D3D10_RESOURCE_DIMENSION ResourceDimension; + D3DX10_IMAGE_FILE_FORMAT ImageFileFormat; +} D3DX10_IMAGE_INFO; + +typedef struct D3DX10_IMAGE_LOAD_INFO +{ + UINT Width; + UINT Height; + UINT Depth; + UINT FirstMipLevel; + UINT MipLevels; + D3D10_USAGE Usage; + UINT BindFlags; + UINT CpuAccessFlags; + UINT MiscFlags; + DXGI_FORMAT Format; + UINT Filter; + UINT MipFilter; + D3DX10_IMAGE_INFO *pSrcInfo; + +#ifdef __cplusplus + D3DX10_IMAGE_LOAD_INFO() + { + Width = D3DX10_DEFAULT; + Height = D3DX10_DEFAULT; + Depth = D3DX10_DEFAULT; + FirstMipLevel = D3DX10_DEFAULT; + MipLevels = D3DX10_DEFAULT; + Usage = (D3D10_USAGE)D3DX10_DEFAULT; + BindFlags = D3DX10_DEFAULT; + CpuAccessFlags = D3DX10_DEFAULT; + MiscFlags = D3DX10_DEFAULT; + Format = DXGI_FORMAT_FROM_FILE; + Filter = D3DX10_DEFAULT; + MipFilter = D3DX10_DEFAULT; + pSrcInfo = NULL; + } +#endif +} D3DX10_IMAGE_LOAD_INFO; + +#ifdef __cplusplus +extern "C" { +#endif + +HRESULT WINAPI D3DX10CreateTextureFromMemory(ID3D10Device *device, const void *src_data, SIZE_T src_data_size, + D3DX10_IMAGE_LOAD_INFO *loadinfo, ID3DX10ThreadPump *pump, ID3D10Resource **texture, HRESULT *hresult); + + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Matteo Bruni : wined3d: Avoid the deprecated gl_FragData on core profile contexts.
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: dd5cf16799573928ae5543ba9b0d575ff5a54e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5cf16799573928ae5543ba9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 31 19:50:58 2016 +0200 wined3d: Avoid the deprecated gl_FragData on core profile contexts. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 53 +++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 75c9109..3127b75 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1619,6 +1619,11 @@ static void PRINTF_ATTR(4, 5) declare_out_varying(const struct wined3d_gl_info * } } +static const char *get_fragment_output(const struct wined3d_gl_info *gl_info) +{ + return needs_legacy_glsl_syntax(gl_info) ? "gl_FragData" : "ps_out"; +} + static BOOL glsl_is_color_reg_read(const struct wined3d_shader *shader, unsigned int idx) { const struct wined3d_shader_signature *input_signature = &shader->input_signature; @@ -2009,6 +2014,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "vec4 vpos;\n"); } + if (!needs_legacy_glsl_syntax(gl_info)) + shader_addline(buffer, "out vec4 ps_out[%u];\n", gl_info->limits.buffers); + if (shader->limits->constant_float + extra_constants_needed >= gl_info->limits.glsl_ps_float_constants) FIXME("Insufficient uniforms to run this shader.\n"); } @@ -2327,7 +2335,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * WARN("Write to render target %u, only %d supported.\n", reg->idx[0].offset, gl_info->limits.buffers); - sprintf(register_name, "gl_FragData[%u]", reg->idx[0].offset); + sprintf(register_name, "%s[%u]", get_fragment_output(gl_info), reg->idx[0].offset); break; case WINED3DSPR_RASTOUT: @@ -5393,18 +5401,24 @@ static GLuint generate_param_reorder_function(struct shader_glsl_priv *priv, return ret; } -static void shader_glsl_generate_srgb_write_correction(struct wined3d_string_buffer *buffer) +static void shader_glsl_generate_srgb_write_correction(struct wined3d_string_buffer *buffer, + const struct wined3d_gl_info *gl_info) { - shader_addline(buffer, "tmp0.xyz = pow(gl_FragData[0].xyz, vec3(srgb_const0.x));\n"); + const char *output = get_fragment_output(gl_info); + + shader_addline(buffer, "tmp0.xyz = pow(%s[0].xyz, vec3(srgb_const0.x));\n", output); shader_addline(buffer, "tmp0.xyz = tmp0.xyz * vec3(srgb_const0.y) - vec3(srgb_const0.z);\n"); - shader_addline(buffer, "tmp1.xyz = gl_FragData[0].xyz * vec3(srgb_const0.w);\n"); - shader_addline(buffer, "bvec3 srgb_compare = lessThan(gl_FragData[0].xyz, vec3(srgb_const1.x));\n"); - shader_addline(buffer, "gl_FragData[0].xyz = mix(tmp0.xyz, tmp1.xyz, vec3(srgb_compare));\n"); - shader_addline(buffer, "gl_FragData[0] = clamp(gl_FragData[0], 0.0, 1.0);\n"); + shader_addline(buffer, "tmp1.xyz = %s[0].xyz * vec3(srgb_const0.w);\n", output); + shader_addline(buffer, "bvec3 srgb_compare = lessThan(%s[0].xyz, vec3(srgb_const1.x));\n", output); + shader_addline(buffer, "%s[0].xyz = mix(tmp0.xyz, tmp1.xyz, vec3(srgb_compare));\n", output); + shader_addline(buffer, "%s[0] = clamp(%s[0], 0.0, 1.0);\n", output, output); } -static void shader_glsl_generate_fog_code(struct wined3d_string_buffer *buffer, enum wined3d_ffp_ps_fog_mode mode) +static void shader_glsl_generate_fog_code(struct wined3d_string_buffer *buffer, + const struct wined3d_gl_info *gl_info, enum wined3d_ffp_ps_fog_mode mode) { + const char *output = get_fragment_output(gl_info); + switch (mode) { case WINED3D_FFP_PS_FOG_OFF: @@ -5428,8 +5442,8 @@ static void shader_glsl_generate_fog_code(struct wined3d_string_buffer *buffer, return; } - shader_addline(buffer, "gl_FragData[0].xyz = mix(ffp_fog.color.xyz, gl_FragData[0].xyz," - " clamp(fog, 0.0, 1.0));\n"); + shader_addline(buffer, "%s[0].xyz = mix(ffp_fog.color.xyz, %s[0].xyz, clamp(fog, 0.0, 1.0));\n", + output, output); } /* Context activation is done by the caller. */ @@ -5513,17 +5527,14 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context /* Pixel shaders < 2.0 place the resulting color in R0 implicitly */ if (reg_maps->shader_version.major < 2) - { - /* Some older cards like GeforceFX ones don't support multiple buffers, so also not gl_FragData */ - shader_addline(buffer, "gl_FragData[0] = R0;\n"); - } + shader_addline(buffer, "%s[0] = R0;\n", get_fragment_output(gl_info)); if (args->srgb_correction) - shader_glsl_generate_srgb_write_correction(buffer); + shader_glsl_generate_srgb_write_correction(buffer, gl_info); /* SM < 3 does not replace the fog stage. */ if (reg_maps->shader_version.major < 3) - shader_glsl_generate_fog_code(buffer, args->fog); + shader_glsl_generate_fog_code(buffer, gl_info, args->fog); shader_addline(buffer, "}\n"); @@ -6612,6 +6623,9 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n"); + if (!needs_legacy_glsl_syntax(gl_info)) + shader_addline(buffer, "out vec4 ps_out[1];\n"); + shader_addline(buffer, "vec4 tmp0, tmp1;\n"); shader_addline(buffer, "vec4 ret;\n"); if (tempreg_used || settings->sRGB_write) @@ -6928,12 +6942,13 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } } - shader_addline(buffer, "gl_FragData[0] = ffp_varying_specular * specular_enable + ret;\n"); + shader_addline(buffer, "%s[0] = ffp_varying_specular * specular_enable + ret;\n", + get_fragment_output(gl_info)); if (settings->sRGB_write) - shader_glsl_generate_srgb_write_correction(buffer); + shader_glsl_generate_srgb_write_correction(buffer, gl_info); - shader_glsl_generate_fog_code(buffer, settings->fog); + shader_glsl_generate_fog_code(buffer, gl_info, settings->fog); shader_addline(buffer, "}\n");

1 0

Stefan Dösinger : wined3d: Introduce wined3d_texture_get_memory().
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: a2c5afe61e27eaac9449b00ff5b5a849c7a192a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c5afe61e27eaac9449b00ff… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Mar 31 22:48:54 2016 +0200 wined3d: Introduce wined3d_texture_get_memory(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 59 +++++++---------------- dlls/wined3d/texture.c | 106 ++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 85 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a2c5afe61e27eaac9449b…

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in device_load_logo ().
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: 0abb6b948ea61d6d98dab2b9dc65d6ae6b0d1013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0abb6b948ea61d6d98dab2b9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 31 22:48:49 2016 +0200 wined3d: Avoid surface_from_resource() in device_load_logo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ef8095f..bda5e43 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -665,7 +665,7 @@ static void device_load_logo(struct wined3d_device *device, const char *filename struct wined3d_surface *surface; /* Fill the surface with a white color to show that wined3d is there */ - surface = surface_from_resource(wined3d_texture_get_sub_resource(device->logo_texture, 0)); + surface = device->logo_texture->sub_resources[0].u.surface; surface_color_fill(surface, &rect, &c); }

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in swapchain_gdi_frontbuffer_updated().
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: e50ff748080fe6381c27013f42efdd1dc9c511a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50ff748080fe6381c27013f4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 31 22:48:53 2016 +0200 wined3d: Avoid surface_from_resource() in swapchain_gdi_frontbuffer_updated(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 84717d1..ba8f66c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -659,7 +659,7 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai TRACE("swapchain %p.\n", swapchain); - front = surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0)); + front = swapchain->front_buffer->sub_resources[0].u.surface; if (swapchain->palette) wined3d_palette_apply_to_dc(swapchain->palette, front->hDC);

1 0

Henri Verbeet : wined3d: Avoid surface_from_resource() in wined3d_device_init_3d().
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: be34aaa789ff7671c6fcb8083e14eafede7cd6fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=be34aaa789ff7671c6fcb8083… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 31 22:48:50 2016 +0200 wined3d: Avoid surface_from_resource() in wined3d_device_init_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bda5e43..d81bb70 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1025,8 +1025,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, device->swapchains[0] = swapchain; device_init_swapchain_state(device, swapchain); - context = context_acquire(device, - surface_from_resource(wined3d_texture_get_sub_resource(swapchain->front_buffer, 0))); + context = context_acquire(device, swapchain->front_buffer->sub_resources[0].u.surface); create_dummy_textures(device, context); create_default_sampler(device);

1 0

Louis Lenders : user32: Add stub for IsProcessDPIAware.
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: 5cf42c0c97cce235101da6762a4cdfc965a09f0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cf42c0c97cce235101da6762… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Apr 1 08:18:30 2016 +0200 user32: Add stub for IsProcessDPIAware. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 9 +++++++++ dlls/user32/user32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 1787b99..a42a302 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2904,3 +2904,12 @@ BOOL WINAPI SetProcessDPIAware( VOID ) return TRUE; } + +/*********************************************************************** + * IsProcessDPIAware (USER32.@) + */ +BOOL WINAPI IsProcessDPIAware(void) +{ + FIXME( "stub!\n"); + return FALSE; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 5c19634..c479879 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -446,6 +446,7 @@ # @ stub IsHungThread @ stdcall IsIconic(long) @ stdcall IsMenu(long) +@ stdcall IsProcessDPIAware() @ stdcall IsRectEmpty(ptr) # @ stub IsServerSideWindow @ stdcall IsTouchWindow(long ptr)

1 0

Nikolay Sivov : d2d1: Move mesh creation to mesh.c.
by Alexandre Julliard April 1, 2016

April 1, 2016

Module: wine Branch: master Commit: 3d222560b22448e9fd17abeb263a716a1ea2c7a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d222560b22448e9fd17abeb2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 31 14:49:32 2016 +0300 d2d1: Move mesh creation to mesh.c. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/mesh.c | 14 ++++++++++---- dlls/d2d1/render_target.c | 12 ++++-------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index bb3f978..f0577ed 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -188,7 +188,7 @@ struct d2d_mesh ID2D1Factory *factory; }; -void d2d_mesh_init(struct d2d_mesh *mesh, ID2D1Factory *factory) DECLSPEC_HIDDEN; +HRESULT d2d_mesh_create(ID2D1Factory *factory, struct d2d_mesh **mesh) DECLSPEC_HIDDEN; struct d2d_bitmap { diff --git a/dlls/d2d1/mesh.c b/dlls/d2d1/mesh.c index 28d34da..eb223ad 100644 --- a/dlls/d2d1/mesh.c +++ b/dlls/d2d1/mesh.c @@ -98,9 +98,15 @@ static const struct ID2D1MeshVtbl d2d_mesh_vtbl = d2d_mesh_Open, }; -void d2d_mesh_init(struct d2d_mesh *mesh, ID2D1Factory *factory) +HRESULT d2d_mesh_create(ID2D1Factory *factory, struct d2d_mesh **mesh) { - mesh->ID2D1Mesh_iface.lpVtbl = &d2d_mesh_vtbl; - mesh->refcount = 1; - ID2D1Factory_AddRef(mesh->factory = factory); + if (!(*mesh = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**mesh)))) + return E_OUTOFMEMORY; + + (*mesh)->ID2D1Mesh_iface.lpVtbl = &d2d_mesh_vtbl; + (*mesh)->refcount = 1; + ID2D1Factory_AddRef((*mesh)->factory = factory); + + TRACE("Created mesh %p.\n", *mesh); + return S_OK; } diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 287d7c3..5005840 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -446,18 +446,14 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateMesh(ID2D1RenderTar { struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); struct d2d_mesh *object; + HRESULT hr; TRACE("iface %p, mesh %p.\n", iface, mesh); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - - d2d_mesh_init(object, render_target->factory); - - TRACE("Created mesh %p.\n", object); - *mesh = &object->ID2D1Mesh_iface; + if (SUCCEEDED(hr = d2d_mesh_create(render_target->factory, &object))) + *mesh = &object->ID2D1Mesh_iface; - return S_OK; + return hr; } static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawLine(ID2D1RenderTarget *iface,

1 0