winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
January 2017
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
492 discussions
Start a n
N
ew thread
Józef Kucia : wined3d: Add ARB_shading_language_packing extension.
by Alexandre Julliard
30 Jan '17
30 Jan '17
Module: wine Branch: master Commit: 1ea53005e77be9e764ff6f14887da2c9af5d6ded URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1ea53005e77be9e764ff6f148…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 28 17:14:00 2017 +0100 wined3d: Add ARB_shading_language_packing extension. For f32tof16 and f16tof32 instructions. 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/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 5 ++++- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d456772..8ec894d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -150,6 +150,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_shader_image_size", ARB_SHADER_IMAGE_SIZE }, {"GL_ARB_shader_texture_lod", ARB_SHADER_TEXTURE_LOD }, {"GL_ARB_shading_language_100", ARB_SHADING_LANGUAGE_100 }, + {"GL_ARB_shading_language_packing", ARB_SHADING_LANGUAGE_PACKING }, {"GL_ARB_shadow", ARB_SHADOW }, {"GL_ARB_stencil_texturing", ARB_STENCIL_TEXTURING }, {"GL_ARB_sync", ARB_SYNC }, @@ -3656,6 +3657,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, {ARB_SHADER_IMAGE_LOAD_STORE, MAKEDWORD_VERSION(4, 2)}, + {ARB_SHADING_LANGUAGE_PACKING, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_COMPRESSION_BPTC, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_STORAGE, MAKEDWORD_VERSION(4, 2)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 968c2a2..c955ec4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6130,6 +6130,8 @@ static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, shader_addline(buffer, "#extension GL_ARB_shader_image_load_store : enable\n"); if (gl_info->supported[ARB_SHADER_IMAGE_SIZE]) shader_addline(buffer, "#extension GL_ARB_shader_image_size : enable\n"); + if (gl_info->supported[ARB_SHADING_LANGUAGE_PACKING]) + shader_addline(buffer, "#extension GL_ARB_shading_language_packing : enable\n"); if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) @@ -8728,7 +8730,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3] && gl_info->supported[ARB_DERIVATIVE_CONTROL] && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] - && gl_info->supported[ARB_SHADER_IMAGE_SIZE]) + && gl_info->supported[ARB_SHADER_IMAGE_SIZE] + && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING]) shader_model = 5; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS] diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 84c49c3..f600d0a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -83,6 +83,7 @@ enum wined3d_gl_extension ARB_SHADER_IMAGE_SIZE, ARB_SHADER_TEXTURE_LOD, ARB_SHADING_LANGUAGE_100, + ARB_SHADING_LANGUAGE_PACKING, ARB_SHADOW, ARB_STENCIL_TEXTURING, ARB_SYNC,
1
0
0
0
Matteo Bruni : d3dx9: Don't forbid supported format conversions.
by Alexandre Julliard
30 Jan '17
30 Jan '17
Module: wine Branch: master Commit: 84a290c12b9994ddfa6bf61b6b0877f88eefa629 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=84a290c12b9994ddfa6bf61b6…
Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 27 19:52:56 2017 +0100 d3dx9: Don't forbid supported format conversions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 16 ++++++++++++++++ dlls/d3dx9_36/surface.c | 11 ++++++----- dlls/d3dx9_36/volume.c | 4 ++-- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index add73bf..9d926c7 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -65,6 +65,22 @@ struct pixel_format_desc { void (*to_rgba)(const struct vec4 *src, struct vec4 *dst, const PALETTEENTRY *palette); }; +static inline BOOL is_conversion_from_supported(const struct pixel_format_desc *format) +{ + if (format->type == FORMAT_ARGB || format->type == FORMAT_ARGBF16 + || format->type == FORMAT_ARGBF) + return TRUE; + return !!format->to_rgba; +} + +static inline BOOL is_conversion_to_supported(const struct pixel_format_desc *format) +{ + if (format->type == FORMAT_ARGB || format->type == FORMAT_ARGBF16 + || format->type == FORMAT_ARGBF) + return TRUE; + return !!format->from_rgba; +} + HRESULT map_view_of_file(const WCHAR *filename, void **buffer, DWORD *length) DECLSPEC_HIDDEN; HRESULT load_resource_into_memory(HMODULE module, HRSRC resinfo, void **buffer, DWORD *length) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 1bfe75a..fc74779 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1837,10 +1837,10 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } else /* Stretching or format conversion. */ { - if (((srcformatdesc->type != FORMAT_ARGB) && (srcformatdesc->type != FORMAT_INDEX)) || - (destformatdesc->type != FORMAT_ARGB)) + if (!is_conversion_from_supported(srcformatdesc) + || !is_conversion_to_supported(destformatdesc)) { - FIXME("Format conversion missing %#x -> %#x\n", src_format, surfdesc.Format); + FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format); return E_NOTIMPL; } @@ -2112,9 +2112,10 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE src_format_desc = get_format_info(src_surface_desc.Format); dst_format_desc = get_format_info(d3d_pixel_format); - if (src_format_desc->type != FORMAT_ARGB || dst_format_desc->type != FORMAT_ARGB) + if (!is_conversion_from_supported(src_format_desc) + || !is_conversion_to_supported(dst_format_desc)) { - FIXME("Unsupported pixel format conversion %#x -> %#x\n", + FIXME("Unsupported format conversion %#x -> %#x.\n", src_surface_desc.Format, d3d_pixel_format); hr = E_NOTIMPL; goto cleanup; diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 7dc61cf..f07e552 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -188,8 +188,8 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, const BYTE *src_addr; - if (((src_format_desc->type != FORMAT_ARGB) && (src_format_desc->type != FORMAT_INDEX)) || - (dst_format_desc->type != FORMAT_ARGB)) + if (!is_conversion_from_supported(src_format_desc) + || !is_conversion_to_supported(dst_format_desc)) { FIXME("Pixel format conversion is not implemented %#x -> %#x\n", src_format_desc->format, dst_format_desc->format);
1
0
0
0
Matteo Bruni : wined3d: If the format is not FBO attachable disable sRGB writes only.
by Alexandre Julliard
30 Jan '17
30 Jan '17
Module: wine Branch: master Commit: 69006a7cc6c43256501f3d6c0a370ced2b2c53fa URL:
http://source.winehq.org/git/wine.git/?a=commit;h=69006a7cc6c43256501f3d6c0…
Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 27 19:52:55 2017 +0100 wined3d: If the format is not FBO attachable disable sRGB writes only. 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/texture.c | 4 ++-- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 31 ++++++++++++++++++------------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b4267ed..63577d7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -572,7 +572,7 @@ void wined3d_texture_bind(struct wined3d_texture *texture, TRACE("texture %p, context %p, srgb %#x.\n", texture, context, srgb); - if (!needs_separate_srgb_gl_texture(context)) + if (!needs_separate_srgb_gl_texture(context, texture)) srgb = FALSE; /* sRGB mode cache for preload() calls outside drawprim. */ @@ -912,7 +912,7 @@ void wined3d_texture_load(struct wined3d_texture *texture, TRACE("texture %p, context %p, srgb %#x.\n", texture, context, srgb); - if (!needs_separate_srgb_gl_texture(context)) + if (!needs_separate_srgb_gl_texture(context, texture)) srgb = FALSE; if (srgb) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1976bc6..4f063b4 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2389,7 +2389,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for { WARN("Format %s's sRGB format is not FBO attachable, type %u.\n", debug_d3dformat(format->id), type); - format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); + format_clear_flag(format, WINED3DFMT_FLAG_SRGB_WRITE); } } else if (status == GL_FRAMEBUFFER_COMPLETE) @@ -2533,7 +2533,7 @@ static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx) { WARN("Format %s's sRGB format is not FBO attachable, resource type %u.\n", debug_d3dformat(format->id), type); - format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); + format_clear_flag(format, WINED3DFMT_FLAG_SRGB_WRITE); } } else if (format->flags[type] & WINED3DFMT_FLAG_FBO_ATTACHABLE) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 051836c..eaf54b1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2949,12 +2949,6 @@ struct wined3d_surface struct list overlay_entry; }; -static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context *context) -{ - return !context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE] - && context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL; -} - static inline unsigned int surface_get_sub_resource_idx(const struct wined3d_surface *surface) { return surface->texture_layer * surface->container->level_count + surface->texture_level; @@ -2965,13 +2959,6 @@ static inline struct wined3d_texture_sub_resource *surface_get_sub_resource(stru return &surface->container->sub_resources[surface_get_sub_resource_idx(surface)]; } -static inline GLuint surface_get_texture_name(const struct wined3d_surface *surface, - const struct wined3d_context *context, BOOL srgb) -{ - return srgb && needs_separate_srgb_gl_texture(context) - ? surface->container->texture_srgb.name : surface->container->texture_rgb.name; -} - HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst_rect, struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *blt_fx, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; @@ -3842,6 +3829,17 @@ static inline void context_apply_state(struct wined3d_context *context, state_table[rep].apply(context, state, rep); } +static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context *context, + const struct wined3d_texture *texture) +{ + unsigned int flags = texture->resource.format_flags; + + return (!context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE] + || (flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE)) + != (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE)) + && context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL; +} + static inline BOOL needs_srgb_write(const struct wined3d_context *context, const struct wined3d_state *state, const struct wined3d_fb_state *fb) { @@ -3850,6 +3848,13 @@ static inline BOOL needs_srgb_write(const struct wined3d_context *context, && fb->render_targets[0] && fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; } +static inline GLuint surface_get_texture_name(const struct wined3d_surface *surface, + const struct wined3d_context *context, BOOL srgb) +{ + return srgb && needs_separate_srgb_gl_texture(context, surface->container) + ? surface->container->texture_srgb.name : surface->container->texture_rgb.name; +} + static inline BOOL can_use_texture_swizzle(const struct wined3d_gl_info *gl_info, const struct wined3d_format *format) { return gl_info->supported[ARB_TEXTURE_SWIZZLE] && !is_complex_fixup(format->color_fixup)
1
0
0
0
Matteo Bruni : wined3d: Correctly handle GL implementations not supporting sRGB FBO attachments.
by Alexandre Julliard
30 Jan '17
30 Jan '17
Module: wine Branch: master Commit: 9fc3444d6ed8ad0e124a77d2faf1e2cc6639f40f URL:
http://source.winehq.org/git/wine.git/?a=commit;h=9fc3444d6ed8ad0e124a77d2f…
Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 27 19:52:54 2017 +0100 wined3d: Correctly handle GL implementations not supporting sRGB FBO attachments. 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/directx.c | 1 + dlls/wined3d/utils.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 944a4a3..d456772 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3893,6 +3893,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD /* Current wined3d sRGB infrastructure requires EXT_texture_sRGB_decode * for GL_ARB_framebuffer_sRGB support (without EXT_texture_sRGB_decode * we never render to sRGB surfaces). */ + TRACE("EXT_texture_sRGB_decode is not supported, disabling ARB_framebuffer_sRGB.\n"); gl_info->supported[ARB_FRAMEBUFFER_SRGB] = FALSE; } if (gl_info->supported[ARB_OCCLUSION_QUERY]) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d7f2182..1976bc6 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1220,7 +1220,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_RENDERTARGET, EXT_PACKED_FLOAT}, /* Palettized formats */ - {WINED3DFMT_P8_UINT, GL_R8, GL_R8, 0, + {WINED3DFMT_P8_UINT, GL_R8, GL_R8, 0, GL_RED, GL_UNSIGNED_BYTE, 0, 0, ARB_TEXTURE_RG, NULL}, @@ -2382,11 +2382,14 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for TRACE("Format %s's sRGB format is FBO attachable, type %u.\n", debug_d3dformat(format->id), type); format->flags[type] |= WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + format->glInternal = format->glGammaInternal; } else { WARN("Format %s's sRGB format is not FBO attachable, type %u.\n", debug_d3dformat(format->id), type); + format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); } } else if (status == GL_FRAMEBUFFER_COMPLETE) @@ -2523,11 +2526,14 @@ static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx) TRACE("Format %s's sRGB format is FBO attachable, resource type %u.\n", debug_d3dformat(format->id), type); format->flags[type] |= WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + format->glInternal = format->glGammaInternal; } else { WARN("Format %s's sRGB format is not FBO attachable, resource type %u.\n", debug_d3dformat(format->id), type); + format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); } } else if (format->flags[type] & WINED3DFMT_FLAG_FBO_ATTACHABLE) @@ -2739,7 +2745,8 @@ static void query_internal_format(struct wined3d_adapter *adapter, if (!(format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) format->glGammaInternal = format->glInternal; - else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) format->glInternal = format->glGammaInternal; } } @@ -2761,7 +2768,8 @@ static void query_internal_format(struct wined3d_adapter *adapter, format->glGammaInternal = format->glInternal; format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); } - else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO + && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) { format->glInternal = format->glGammaInternal; }
1
0
0
0
Matteo Bruni : d3d9/tests: Add a trace to clear_test() to show whether sRGB writes are supported.
by Alexandre Julliard
30 Jan '17
30 Jan '17
Module: wine Branch: master Commit: 7e30dc8b4eadb2b7baedb9bf8ab6fb6f6d21fd53 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7e30dc8b4eadb2b7baedb9bf8…
Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jan 27 19:52:53 2017 +0100 d3d9/tests: Add a trace to clear_test() to show whether sRGB writes are supported. 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/d3d9/tests/visual.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4bea1e1..601461f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -900,7 +900,7 @@ static void clear_test(void) D3DVIEWPORT9 old_vp, vp; RECT scissor; DWORD oldColorWrite; - BOOL invalid_clear_failed = FALSE; + BOOL invalid_clear_failed = FALSE, srgb_supported; IDirect3DDevice9 *device; IDirect3D9 *d3d; ULONG refcount; @@ -1149,6 +1149,9 @@ static void clear_test(void) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); /* Test D3DRS_SRGBWRITEENABLE interactions with clears. */ + srgb_supported = SUCCEEDED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_QUERY_SRGBWRITE, D3DRTYPE_TEXTURE, D3DFMT_A8R8G8B8)); + trace("sRGB writing to D3DFMT_A8R8G8B8 is %ssupported.\n", srgb_supported ? "" : "not "); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x7f7f7f7f, 0.0, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr);
1
0
0
0
Alex Henrie : ddraw: Don' t crash if writing out a new ddraw7 surface segfaults.
by Alexandre Julliard
30 Jan '17
30 Jan '17
Module: wine Branch: master Commit: c9e29bff7bbded119e9052b6740545e70cafdcd8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c9e29bff7bbded119e9052b67…
Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 28 15:34:06 2017 -0700 ddraw: Don't crash if writing out a new ddraw7 surface segfaults. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 22 +++++++++++++++------- dlls/ddraw/tests/ddraw7.c | 2 ++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index ebb2706..f015b01d 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2814,15 +2814,23 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 7); wined3d_mutex_unlock(); - if (FAILED(hr)) + + __TRY { - *surface = NULL; - return hr; + if (FAILED(hr)) + { + *surface = NULL; + break; + } + *surface = &impl->IDirectDrawSurface7_iface; + IDirectDraw7_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; } - - *surface = &impl->IDirectDrawSurface7_iface; - IDirectDraw7_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; + __EXCEPT_PAGE_FAULT + { + hr = E_INVALIDARG; + } + __ENDTRY; return hr; } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d802a59..44695cb 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1994,6 +1994,8 @@ static void test_surface_qi(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface7 **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
1
0
0
0
Alex Henrie : ddraw: Don' t crash if writing out a new ddraw4 surface segfaults.
by Alexandre Julliard
30 Jan '17
30 Jan '17
Module: wine Branch: master Commit: 1850ac577038b8a16c4f153b9f3177e959f27c82 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1850ac577038b8a16c4f153b9…
Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 28 15:34:05 2017 -0700 ddraw: Don't crash if writing out a new ddraw4 surface segfaults. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 22 +++++++++++++++------- dlls/ddraw/tests/ddraw4.c | 2 ++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 1e69df4..ebb2706 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2868,15 +2868,23 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, hr = ddraw_surface_create(ddraw, surface_desc, &impl, outer_unknown, 4); wined3d_mutex_unlock(); - if (FAILED(hr)) + + __TRY { - *surface = NULL; - return hr; + if (FAILED(hr)) + { + *surface = NULL; + break; + } + *surface = &impl->IDirectDrawSurface4_iface; + IDirectDraw4_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; } - - *surface = &impl->IDirectDrawSurface4_iface; - IDirectDraw4_AddRef(iface); - impl->ifaceToRelease = (IUnknown *)iface; + __EXCEPT_PAGE_FAULT + { + hr = E_INVALIDARG; + } + __ENDTRY; return hr; } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1ace50a..3aec876 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2267,6 +2267,8 @@ static void test_surface_qi(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface4 **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
1
0
0
0
Alex Henrie : ddraw: Don' t crash if writing out a new ddraw2 surface segfaults.
by Alexandre Julliard
30 Jan '17
30 Jan '17
Module: wine Branch: master Commit: f6997e8fe0563da811d1627034dd95ab3a8e10af URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f6997e8fe0563da811d162703…
Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 28 15:34:04 2017 -0700 ddraw: Don't crash if writing out a new ddraw2 surface segfaults. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 20 ++++++++++++++------ dlls/ddraw/tests/ddraw2.c | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b8e2f57..1e69df4 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2924,14 +2924,22 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 2); wined3d_mutex_unlock(); - if (FAILED(hr)) + + __TRY { - *surface = NULL; - return hr; + if (FAILED(hr)) + { + *surface = NULL; + break; + } + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; } - - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; + __EXCEPT_PAGE_FAULT + { + hr = E_INVALIDARG; + } + __ENDTRY; return hr; } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ce3f6de..26c2c33 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2119,6 +2119,8 @@ static void test_surface_qi(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
1
0
0
0
Alex Henrie : ddraw: Don' t crash if writing out a new ddraw1 surface segfaults.
by Alexandre Julliard
30 Jan '17
30 Jan '17
Module: wine Branch: master Commit: d9f2b4627af575ebcd28395d9ba3744cab6c5f36 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d9f2b4627af575ebcd28395d9…
Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 28 15:34:03 2017 -0700 ddraw: Don't crash if writing out a new ddraw1 surface segfaults. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 22 ++++++++++++++++------ dlls/ddraw/tests/ddraw1.c | 2 ++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e313a75..b8e2f57 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -26,6 +26,8 @@ #include "ddraw_private.h" +#include "wine/exception.h" + WINE_DEFAULT_DEBUG_CHANNEL(ddraw); static const struct ddraw *exclusive_ddraw; @@ -2974,14 +2976,22 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, DDSD_to_DDSD2(surface_desc, &surface_desc2); hr = ddraw_surface_create(ddraw, &surface_desc2, &impl, outer_unknown, 1); wined3d_mutex_unlock(); - if (FAILED(hr)) + + __TRY { - *surface = NULL; - return hr; + if (FAILED(hr)) + { + *surface = NULL; + break; + } + *surface = &impl->IDirectDrawSurface_iface; + impl->ifaceToRelease = NULL; } - - *surface = &impl->IDirectDrawSurface_iface; - impl->ifaceToRelease = NULL; + __EXCEPT_PAGE_FAULT + { + hr = E_INVALIDARG; + } + __ENDTRY; return hr; } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index ed4c5ec..ff88b74 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1967,6 +1967,8 @@ static void test_surface_qi(void) surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; surface_desc.dwWidth = 512; surface_desc.dwHeight = 512; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, (IDirectDrawSurface **)0xdeadbeef, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr);
1
0
0
0
Nikolay Sivov : oledb32: Fixed IDataInitialize definition.
by Alexandre Julliard
30 Jan '17
30 Jan '17
Module: wine Branch: master Commit: 37fcb0d630545f4b8daf96d6da65a04cfd7dc85e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=37fcb0d630545f4b8daf96d6d…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 29 21:30:23 2017 +0300 oledb32: Fixed IDataInitialize definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/datainit.c | 10 +++++----- include/msdasc.idl | 10 ++++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 42d5dae..8d6b8ef 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -918,13 +918,13 @@ static HRESULT WINAPI datainit_CreateDBInstance(IDataInitialize *iface, REFCLSID return CoCreateInstance(provider, outer, clsctx, riid, (void**)datasource); } -static HRESULT WINAPI datainit_RemoteCreateDBInstanceEx(IDataInitialize *iface, REFCLSID clsidProvider, - IUnknown *pUnkOuter, DWORD dwClsCtx, LPWSTR pwszReserved, COSERVERINFO *pServerInfo, - DWORD cmq, GUID **rgpIID, IUnknown **rgpItf, HRESULT *rghr) +static HRESULT WINAPI datainit_CreateDBInstanceEx(IDataInitialize *iface, REFCLSID provider, IUnknown *outer, + DWORD clsctx, LPWSTR reserved, COSERVERINFO *server_info, DWORD cmq, MULTI_QI *results) { datainit *This = impl_from_IDataInitialize(iface); - FIXME("(%p)->()\n", This); + FIXME("(%p)->(%s %p %#x %s %p %u %p)\n", This, debugstr_guid(provider), outer, clsctx, + debugstr_w(reserved), server_info, cmq, results); return E_NOTIMPL; } @@ -958,7 +958,7 @@ static const struct IDataInitializeVtbl datainit_vtbl = datainit_GetDataSource, datainit_GetInitializationString, datainit_CreateDBInstance, - datainit_RemoteCreateDBInstanceEx, + datainit_CreateDBInstanceEx, datainit_LoadStringFromStorage, datainit_WriteStringToStorage }; diff --git a/include/msdasc.idl b/include/msdasc.idl index e3efb1d..6a904ba 100644 --- a/include/msdasc.idl +++ b/include/msdasc.idl @@ -102,10 +102,16 @@ library MSDASC [in] DWORD dwClsCtx, [in] LPWSTR pwszReserved, [in] REFIID riid, [out] IUnknown** ppDataSource); + [local] + HRESULT CreateDBInstanceEx([in] REFCLSID clsidProvider, [in] IUnknown* pUnkOuter, + [in] DWORD dwClsCtx, [in] LPWSTR pwszReserved, [in] COSERVERINFO* pServerInfo, + [in] DWORD cmq, [in, out, size_is(cmq)] MULTI_QI *results); + + [call_as(CreateDBInstanceEx)] HRESULT RemoteCreateDBInstanceEx([in] REFCLSID clsidProvider, [in] IUnknown* pUnkOuter, [in] DWORD dwClsCtx, [in] LPWSTR pwszReserved, [in] COSERVERINFO* pServerInfo, - [in] DWORD cmq, [in] GUID** rgpIID, [out] IUnknown** rgpItf, - [out] HRESULT* rghr); + [in] DWORD cmq, [in, size_is(cmq)] const IID **iids, [out, size_is(cmq)] IUnknown **ifs, + [out, size_is(cmq)] HRESULT *hr); HRESULT LoadStringFromStorage([in] LPWSTR pwszFileName, [out] LPWSTR* ppwszInitializationString);
1
0
0
0
← Newer
1
...
8
9
10
11
12
13
14
...
50
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
Results per page:
10
25
50
100
200