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

Matteo Bruni : wined3d: Don' t use the builtin FFP uniforms for the material.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 978fe23218c98ef695e6d9999797dd959e56a9ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=978fe23218c98ef695e6d9999… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:45 2015 +0200 wined3d: Don't use the builtin FFP uniforms for the material. --- dlls/wined3d/glsl_shader.c | 67 +++++++++++++++++++++++++++++++++++++----- dlls/wined3d/wined3d_private.h | 5 ++-- 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3d04956..851fc28 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -122,6 +122,11 @@ struct glsl_vs_program GLint projection_matrix_location; GLint normal_matrix_location; GLint texture_matrix_location[MAX_TEXTURES]; + GLint material_ambient_location; + GLint material_diffuse_location; + GLint material_specular_location; + GLint material_emission_location; + GLint material_shininess_location; }; struct glsl_gs_program @@ -1071,6 +1076,28 @@ static void shader_glsl_ffp_vertex_texmatrix_uniform(const struct wined3d_contex checkGLcall("glUniformMatrix4fv"); } +static void shader_glsl_ffp_vertex_material_uniform(const struct wined3d_context *context, + const struct wined3d_state *state, struct glsl_shader_prog_link *prog) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (state->render_states[WINED3D_RS_SPECULARENABLE]) + { + GL_EXTCALL(glUniform4fv(prog->vs.material_specular_location, 1, &state->material.specular.r)); + GL_EXTCALL(glUniform1f(prog->vs.material_shininess_location, state->material.power)); + } + else + { + static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; + + GL_EXTCALL(glUniform4fv(prog->vs.material_specular_location, 1, black)); + } + GL_EXTCALL(glUniform4fv(prog->vs.material_ambient_location, 1, &state->material.ambient.r)); + GL_EXTCALL(glUniform4fv(prog->vs.material_diffuse_location, 1, &state->material.diffuse.r)); + GL_EXTCALL(glUniform4fv(prog->vs.material_emission_location, 1, &state->material.emissive.r)); + checkGLcall("setting FFP material uniforms"); +} + /* Context activation is done by the caller (state handler). */ static void shader_glsl_load_color_key_constant(const struct glsl_ps_program *ps, const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) @@ -1151,6 +1178,9 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context shader_glsl_ffp_vertex_texmatrix_uniform(context, state, i, prog); } + if (update_mask & WINED3D_SHADER_CONST_FFP_MATERIAL) + shader_glsl_ffp_vertex_material_uniform(context, state, prog); + if (update_mask & WINED3D_SHADER_CONST_PS_F) shader_glsl_load_constantsF(pshader, gl_info, state->ps_consts_f, prog->ps.uniform_f_locations, &priv->pconst_heap, priv->stack, constant_version); @@ -5279,10 +5309,10 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "vec3 dir, dst;\n"); shader_addline(buffer, "float att, t;\n"); - ambient = shader_glsl_ffp_mcs(settings->ambient_source, "gl_FrontMaterial.ambient"); - diffuse = shader_glsl_ffp_mcs(settings->diffuse_source, "gl_FrontMaterial.diffuse"); - specular = shader_glsl_ffp_mcs(settings->specular_source, "gl_FrontMaterial.specular"); - emission = shader_glsl_ffp_mcs(settings->emission_source, "gl_FrontMaterial.emission"); + ambient = shader_glsl_ffp_mcs(settings->ambient_source, "ffp_material.ambient"); + diffuse = shader_glsl_ffp_mcs(settings->diffuse_source, "ffp_material.diffuse"); + specular = shader_glsl_ffp_mcs(settings->specular_source, "ffp_material.specular"); + emission = shader_glsl_ffp_mcs(settings->emission_source, "ffp_material.emission"); for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) { @@ -5306,7 +5336,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); else shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); - shader_addline(buffer, "if (t > 0.0) specular += (pow(t, gl_FrontMaterial.shininess)" + shader_addline(buffer, "if (t > 0.0) specular += (pow(t, ffp_material.shininess)" " * gl_LightSource[%u].specular) / att;\n", i); break; @@ -5331,7 +5361,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); else shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); - shader_addline(buffer, "if (t > 0.0) specular += (pow(t, gl_FrontMaterial.shininess)" + shader_addline(buffer, "if (t > 0.0) specular += (pow(t, ffp_material.shininess)" " * gl_LightSource[%u].specular) * att;\n", i); break; @@ -5348,7 +5378,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "t = dot(normal, normalize(dir - normalize(ec_pos.xyz)));\n"); else shader_addline(buffer, "t = dot(normal, normalize(dir + vec3(0.0, 0.0, -1.0)));\n"); - shader_addline(buffer, "if (t > 0.0) specular += pow(t, gl_FrontMaterial.shininess)" + shader_addline(buffer, "if (t > 0.0) specular += pow(t, ffp_material.shininess)" " * gl_LightSource[%u].specular;\n", i); break; @@ -5382,6 +5412,14 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct wined3d_string_buffe shader_addline(buffer, "uniform mat3 ffp_normal_matrix;\n"); shader_addline(buffer, "uniform mat4 ffp_texture_matrix[%u];\n", MAX_TEXTURES); + shader_addline(buffer, "uniform struct\n{\n"); + shader_addline(buffer, " vec4 emission;\n"); + shader_addline(buffer, " vec4 ambient;\n"); + shader_addline(buffer, " vec4 diffuse;\n"); + shader_addline(buffer, " vec4 specular;\n"); + shader_addline(buffer, " float shininess;\n"); + shader_addline(buffer, "} ffp_material;\n"); + shader_addline(buffer, "\nvoid main()\n{\n"); shader_addline(buffer, "float m;\n"); shader_addline(buffer, "vec3 r;\n"); @@ -6176,6 +6214,11 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * string_buffer_sprintf(name, "ffp_texture_matrix[%u]", i); vs->texture_matrix_location[i] = GL_EXTCALL(glGetUniformLocation(program_id, name->buffer)); } + vs->material_ambient_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.ambient")); + vs->material_diffuse_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.diffuse")); + vs->material_specular_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.specular")); + vs->material_emission_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.emission")); + vs->material_shininess_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.shininess")); string_buffer_release(&priv->string_buffers, name); } @@ -6497,6 +6540,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const break; } } + if (entry->vs.material_ambient_location != -1) + entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MATERIAL; } if (gshader) @@ -7534,12 +7579,18 @@ static void glsl_vertex_pipe_texmatrix(struct wined3d_context *context, context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_TEXMATRIX; } +static void glsl_vertex_pipe_material(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_MATERIAL; +} + static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = { {STATE_VDECL, {STATE_VDECL, glsl_vertex_pipe_vdecl }, WINED3D_GL_EXT_NONE }, {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), glsl_vertex_pipe_vs }, WINED3D_GL_EXT_NONE }, {STATE_MATERIAL, {STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_SPECULARENABLE), {STATE_RENDER(WINED3D_RS_SPECULARENABLE), state_specularenable }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_SPECULARENABLE), {STATE_RENDER(WINED3D_RS_SPECULARENABLE), glsl_vertex_pipe_material}, WINED3D_GL_EXT_NONE }, /* Clip planes */ {STATE_CLIPPLANE(0), {STATE_CLIPPLANE(0), clipplane }, WINED3D_GL_EXT_NONE }, {STATE_CLIPPLANE(1), {STATE_CLIPPLANE(1), clipplane }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fcba39b..eeb752a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -309,8 +309,9 @@ enum wined3d_shader_resource_type #define WINED3D_SHADER_CONST_FFP_MODELVIEW 0x00000400 #define WINED3D_SHADER_CONST_FFP_PROJ 0x00000800 #define WINED3D_SHADER_CONST_FFP_TEXMATRIX 0x00001000 -#define WINED3D_SHADER_CONST_FFP_PS 0x00002000 -#define WINED3D_SHADER_CONST_FFP_COLOR_KEY 0x00004000 +#define WINED3D_SHADER_CONST_FFP_MATERIAL 0x00002000 +#define WINED3D_SHADER_CONST_FFP_PS 0x00004000 +#define WINED3D_SHADER_CONST_FFP_COLOR_KEY 0x00008000 enum wined3d_shader_register_type {

1 0

Matteo Bruni : wined3d: Don' t use the builtin FFP uniforms for texture transformation matrices.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 6984ca7f46a379e3adc8f18c50bd5bab169604ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=6984ca7f46a379e3adc8f18c5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:44 2015 +0200 wined3d: Don't use the builtin FFP uniforms for texture transformation matrices. --- dlls/wined3d/glsl_shader.c | 101 ++++++++++++++++++++++++++++------------- dlls/wined3d/state.c | 4 +- dlls/wined3d/wined3d_private.h | 9 ++-- 3 files changed, 75 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6984ca7f46a379e3adc8f…

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_SetInterpolationMode().
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 1014d9a105609c9c3c6cdf4b5bee76e69b24efae URL: http://source.winehq.org/git/wine.git/?a=commit;h=1014d9a105609c9c3c6cdf4b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:35 2015 +0200 d2d1: Implement d2d_bitmap_brush_SetInterpolationMode(). --- dlls/d2d1/brush.c | 68 ++++++++++++++++++++++++++++++------------------ dlls/d2d1/d2d1_private.h | 1 + 2 files changed, 44 insertions(+), 25 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 9e45e1a..c15945a 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -499,7 +499,8 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_brush_Release(ID2D1BitmapBrush *iface) if (!refcount) { - ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + if (brush->u.bitmap.sampler_state) + ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); HeapFree(GetProcessHeap(), 0, brush); } @@ -565,7 +566,16 @@ static void STDMETHODCALLTYPE d2d_bitmap_brush_SetExtendModeY(ID2D1BitmapBrush * static void STDMETHODCALLTYPE d2d_bitmap_brush_SetInterpolationMode(ID2D1BitmapBrush *iface, D2D1_BITMAP_INTERPOLATION_MODE mode) { - FIXME("iface %p, mode %#x stub!\n", iface, mode); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p, mode %#x.\n", iface, mode); + + brush->u.bitmap.interpolation_mode = mode; + if (brush->u.bitmap.sampler_state) + { + ID3D10SamplerState_Release(brush->u.bitmap.sampler_state); + brush->u.bitmap.sampler_state = NULL; + } } static void STDMETHODCALLTYPE d2d_bitmap_brush_SetBitmap(ID2D1BitmapBrush *iface, ID2D1Bitmap *bitmap) @@ -627,35 +637,16 @@ static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl = HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) { - D3D10_SAMPLER_DESC sampler_desc; - HRESULT hr; FIXME("Ignoring brush properties.\n"); d2d_brush_init(brush, &render_target->ID2D1RenderTarget_iface, D2D_BRUSH_TYPE_BITMAP, brush_desc, (ID2D1BrushVtbl *)&d2d_bitmap_brush_vtbl); brush->u.bitmap.bitmap = unsafe_impl_from_ID2D1Bitmap(bitmap); - - sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; - sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; - sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; - sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; - sampler_desc.MipLODBias = 0.0f; - sampler_desc.MaxAnisotropy = 0; - sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; - sampler_desc.BorderColor[0] = 0.0f; - sampler_desc.BorderColor[1] = 0.0f; - sampler_desc.BorderColor[2] = 0.0f; - sampler_desc.BorderColor[3] = 0.0f; - sampler_desc.MinLOD = 0.0f; - sampler_desc.MaxLOD = 0.0f; - - if (FAILED(hr = ID3D10Device_CreateSamplerState(render_target->device, - &sampler_desc, &brush->u.bitmap.sampler_state))) - { - ERR("Failed to create sampler state, hr %#x.\n", hr); - return hr; - } + if (bitmap_brush_desc) + brush->u.bitmap.interpolation_mode = bitmap_brush_desc->interpolationMode; + else + brush->u.bitmap.interpolation_mode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR; return S_OK; } @@ -672,9 +663,36 @@ struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) { + HRESULT hr; + if (brush->type == D2D_BRUSH_TYPE_BITMAP) { ID3D10Device_PSSetShaderResources(device, 0, 1, &brush->u.bitmap.bitmap->view); + if (!brush->u.bitmap.sampler_state) + { + D3D10_SAMPLER_DESC sampler_desc; + + if (brush->u.bitmap.interpolation_mode == D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR) + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; + else + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_LINEAR; + sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D10_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + + if (FAILED(hr = ID3D10Device_CreateSamplerState(device, + &sampler_desc, &brush->u.bitmap.sampler_state))) + ERR("Failed to create sampler state, hr %#x.\n", hr); + } ID3D10Device_PSSetSamplers(device, 0, 1, &brush->u.bitmap.sampler_state); } } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 48465f2..285c422 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -125,6 +125,7 @@ struct d2d_brush struct { struct d2d_bitmap *bitmap; + D2D1_BITMAP_INTERPOLATION_MODE interpolation_mode; ID3D10SamplerState *sampler_state; } bitmap; } u;

1 0

Henri Verbeet : d2d1: Implement d2d_bitmap_brush_GetInterpolationMode().
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 719dfff5bd87577ebcefe2b35aff8313e84fc00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=719dfff5bd87577ebcefe2b35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 19:31:36 2015 +0200 d2d1: Implement d2d_bitmap_brush_GetInterpolationMode(). --- dlls/d2d1/brush.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index c15945a..f2cb99e 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -599,9 +599,11 @@ static D2D1_EXTEND_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetExtendModeY(ID2D1B static D2D1_BITMAP_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetInterpolationMode(ID2D1BitmapBrush *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_brush *brush = impl_from_ID2D1BitmapBrush(iface); + + TRACE("iface %p.\n", iface); - return D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR; + return brush->u.bitmap.interpolation_mode; } static void STDMETHODCALLTYPE d2d_bitmap_brush_GetBitmap(ID2D1BitmapBrush *iface, ID2D1Bitmap **bitmap)

1 0

Nikolay Sivov : dmime: Fix a couple of trace messages.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 2d77891fab46d44fd694053012ca304cb9f89c07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d77891fab46d44fd69405301… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 27 00:38:53 2015 +0300 dmime: Fix a couple of trace messages. --- dlls/dmime/graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 76d4706..7975a4f 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -600,14 +600,14 @@ static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream* pStm) static HRESULT WINAPI PersistStream_Save(IPersistStream *iface, IStream *stream, BOOL clear_dirty) { IDirectMusicGraphImpl *This = impl_from_IPersistStream(iface); - FIXME("(%p) %p %d\n", This, stream, clear_dirty); + TRACE("(%p) %p %d\n", This, stream, clear_dirty); return E_NOTIMPL; } static HRESULT WINAPI PersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) { IDirectMusicGraphImpl *This = impl_from_IPersistStream(iface); - FIXME("(%p) %p\n", This, size); + TRACE("(%p) %p\n", This, size); return E_NOTIMPL; }

1 0

Mark Harmstone : include: Add buffered animation functions to uxtheme.h.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 4a1ebd7369ee8d7044a62887d9813c7aa3a5eeff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a1ebd7369ee8d7044a62887d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Sat Apr 25 19:37:54 2015 +0100 include: Add buffered animation functions to uxtheme.h. --- include/uxtheme.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/uxtheme.h b/include/uxtheme.h index fa0d3cb..e6994a1 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -213,4 +213,32 @@ HDC WINAPI GetBufferedPaintDC(HPAINTBUFFER); HDC WINAPI GetBufferedPaintTargetDC(HPAINTBUFFER); HRESULT WINAPI GetBufferedPaintTargetRect(HPAINTBUFFER, RECT *prc); +/* double-buffered animation functions */ + +typedef HANDLE HANIMATIONBUFFER; + +typedef enum _BP_ANIMATIONSTYLE +{ + BPAS_NONE, + BPAS_LINEAR, + BPAS_CUBIC, + BPAS_SINE +} BP_ANIMATIONSTYLE; + +typedef struct _BP_ANIMATIONPARAMS +{ + DWORD cbSize; + DWORD dwFlags; + BP_ANIMATIONSTYLE style; + DWORD dwDuration; +} BP_ANIMATIONPARAMS, *PBP_ANIMATIONPARAMS; + +HANIMATIONBUFFER WINAPI BeginBufferedAnimation(HWND, HDC, const RECT *, + BP_BUFFERFORMAT, BP_PAINTPARAMS *, + BP_ANIMATIONPARAMS *, HDC *, HDC *); + +BOOL WINAPI BufferedPaintRenderAnimation(HWND, HDC); +HRESULT WINAPI BufferedPaintStopAllAnimations(HWND); +HRESULT WINAPI EndBufferedAnimation(HANIMATIONBUFFER, BOOL); + #endif

1 0

Francois Gouget : kernel32/tests: Make test_StartupNoConsole() static.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: ad2c07888eb4bf433d7e8da19a974549f1ba4d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2c07888eb4bf433d7e8da19… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 25 10:03:36 2015 +0200 kernel32/tests: Make test_StartupNoConsole() static. --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 4f7c58d..6660af4 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2656,7 +2656,7 @@ static void test_BreakawayOk(HANDLE job) ok(ret, "SetInformationJobObject error %u\n", GetLastError()); } -void test_StartupNoConsole(void) +static void test_StartupNoConsole(void) { #ifndef _WIN64 char buffer[MAX_PATH];

1 0

Stefan Dösinger : wined3d: Move the ARB_texture_cube_map check to init_format_texture_info.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 0d6d64b35897eb384ddacaaf8f54067088a247ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6d64b35897eb384ddacaaf8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Apr 26 16:09:11 2015 +0200 wined3d: Move the ARB_texture_cube_map check to init_format_texture_info. --- dlls/wined3d/directx.c | 6 ------ dlls/wined3d/texture.c | 6 ------ dlls/wined3d/utils.c | 3 ++- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index faa1a7f..36be539 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4430,12 +4430,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad switch (resource_type) { case WINED3D_RTYPE_CUBE_TEXTURE: - if (!gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - TRACE("[FAILED] - No cube texture support.\n"); - return WINED3DERR_NOTAVAILABLE; - } - format_flags |= WINED3DFMT_FLAG_TEXTURE; allowed_usage = WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_DYNAMIC diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c62dea4..589f8bf 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -979,12 +979,6 @@ static HRESULT cubetexture_init(struct wined3d_texture *texture, const struct wi return WINED3DERR_INVALIDCALL; } - if (!gl_info->supported[ARB_TEXTURE_CUBE_MAP] && desc->pool != WINED3D_POOL_SCRATCH) - { - WARN("(%p) : Tried to create not supported cube texture.\n", texture); - return WINED3DERR_INVALIDCALL; - } - /* Calculate levels for mip mapping */ if (desc->usage & WINED3DUSAGE_AUTOGENMIPMAP) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b45e0bf..405a79c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1859,7 +1859,8 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win format->flags[WINED3D_GL_RES_TYPE_TEX_2D] |= format_texture_info[i].flags; if (gl_info->supported[EXT_TEXTURE3D]) format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= format_texture_info[i].flags; - format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].flags; + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) + format->flags[WINED3D_GL_RES_TYPE_TEX_CUBE] |= format_texture_info[i].flags; format->flags[WINED3D_GL_RES_TYPE_TEX_RECT] |= format_texture_info[i].flags; format->flags[WINED3D_GL_RES_TYPE_BUFFER] |= format_texture_info[i].flags;

1 0

Matteo Bruni : wined3d: Rename struct wined3d_shader_buffer to wined3d_string_buffer.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 64463b81dfb2a2c8fcfd3388d588983c77513294 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64463b81dfb2a2c8fcfd3388d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:41 2015 +0200 wined3d: Rename struct wined3d_shader_buffer to wined3d_string_buffer. Also rename the shader_buffer_(clear|init|free) functions. --- dlls/wined3d/arb_program_shader.c | 168 +++++++++++++++++++------------------- dlls/wined3d/glsl_shader.c | 102 +++++++++++------------ dlls/wined3d/shader.c | 14 ++-- dlls/wined3d/wined3d_private.h | 17 ++-- 4 files changed, 150 insertions(+), 151 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64463b81dfb2a2c8fcfd3…

1 0

Matteo Bruni : wined3d: Introduce a scratch string buffers framework.
by Alexandre Julliard April 27, 2015

April 27, 2015

Module: wine Branch: master Commit: 84ca0203bfc9c35aa651e242f297bae5ef926f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ca0203bfc9c35aa651e242f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Apr 24 22:25:43 2015 +0200 wined3d: Introduce a scratch string buffers framework. --- dlls/wined3d/glsl_shader.c | 98 ++++++++++++++++++++++++------------------ dlls/wined3d/shader.c | 65 ++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 12 ++++++ 3 files changed, 132 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84ca0203bfc9c35aa651e…

1 0