wine-commits October 2011

wine-commits@winehq.org

3 participants
783 discussions

Matteo Bruni : wined3d: Enable SM4 support in the GLSL shader backend when possible.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 5f2c6b3c8289bb71ad3baf62c66b56b776adb671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2c6b3c8289bb71ad3baf62c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 25 16:58:45 2011 +0200 wined3d: Enable SM4 support in the GLSL shader backend when possible. --- dlls/wined3d/directx.c | 4 ++-- dlls/wined3d/glsl_shader.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5d6eef9..f6228eb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4750,7 +4750,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte * are the same among all shader models. So to avoid code duplication set the shader version * specific, but otherwise constant caps here */ - if (caps->VertexShaderVersion == 3) + if (caps->VertexShaderVersion >= 3) { /* Where possible set the caps based on OpenGL extensions and if they * aren't set (in case of software rendering) use the VS 3.0 from @@ -4787,7 +4787,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxVertexShader30InstructionSlots = 0; } - if (caps->PixelShaderVersion == 3) + if (caps->PixelShaderVersion >= 3) { /* Where possible set the caps based on OpenGL extensions and if they * aren't set (in case of software rendering) use the PS 3.0 from diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3092ce3..2c7cfe9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4913,9 +4913,15 @@ static void shader_glsl_context_destroyed(void *shader_priv, const struct wined3 static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) { + if (gl_info->supported[EXT_GPU_SHADER4] && gl_info->supported[ARB_GEOMETRY_SHADER4] + && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50)) + { + caps->VertexShaderVersion = 4; + caps->PixelShaderVersion = 4; + } /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 * texldd and texldl instructions. */ - if (gl_info->supported[ARB_SHADER_TEXTURE_LOD] || gl_info->supported[EXT_GPU_SHADER4]) + else if (gl_info->supported[ARB_SHADER_TEXTURE_LOD] || gl_info->supported[EXT_GPU_SHADER4]) { caps->VertexShaderVersion = 3; caps->PixelShaderVersion = 3;

1 0

Matteo Bruni : wined3d: Return only the shader major version.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 7254f5e661598a148dd61d008338fd69c49a7ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7254f5e661598a148dd61d008… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 25 16:58:44 2011 +0200 wined3d: Return only the shader major version. --- dlls/d3d8/directx.c | 10 ++++++---- dlls/d3d9/directx.c | 18 +++++++++++++++--- dlls/wined3d/arb_program_shader.c | 12 ++++++------ dlls/wined3d/directx.c | 14 +++++++------- dlls/wined3d/glsl_shader.c | 16 ++++++++-------- 5 files changed, 42 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7254f5e661598a148dd61…

1 0

Matteo Bruni : d3d9: Limit VS/PS reported version.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 6e6a917617ab79a309e123a0207995b574bc59ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e6a917617ab79a309e123a02… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Oct 25 16:58:43 2011 +0200 d3d9: Limit VS/PS reported version. --- dlls/d3d9/directx.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 148b9b7..4099a99 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -381,6 +381,11 @@ void filter_caps(D3DCAPS9* pCaps) pCaps->MaxVertexShaderConst = min(D3D9_MAX_VERTEX_SHADER_CONSTANTF, pCaps->MaxVertexShaderConst); pCaps->NumSimultaneousRTs = min(D3D9_MAX_SIMULTANEOUS_RENDERTARGETS, pCaps->NumSimultaneousRTs); + + if (pCaps->PixelShaderVersion > D3DPS_VERSION(3,0)) + pCaps->PixelShaderVersion = D3DPS_VERSION(3,0); + if (pCaps->VertexShaderVersion > D3DVS_VERSION(3,0)) + pCaps->VertexShaderVersion = D3DVS_VERSION(3,0); } static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(IDirect3D9Ex *iface, UINT Adapter,

1 0

Alex Henrie : kernel32: Output message to stderr in current Unix codepage.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 3aff781f63fd7d61e6f42898dc88ef1eaaed9527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aff781f63fd7d61e6f42898d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Oct 25 16:16:21 2011 -0600 kernel32: Output message to stderr in current Unix codepage. Fixes a bug in which the command "wine /." outputs a garbled error message in languages other than English. Supersedes "kernel32: Output message to stderr in UTF-8" --- dlls/kernel32/process.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 6d42696..b6c0b9d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1252,7 +1252,7 @@ void CDECL __wine_kernel_init(void) args[0] = (DWORD_PTR)main_exe_name; FormatMessageW( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ARGUMENT_ARRAY, NULL, error, 0, msgW, sizeof(msgW)/sizeof(WCHAR), (__ms_va_list *)args ); - WideCharToMultiByte( CP_ACP, 0, msgW, -1, msg, sizeof(msg), NULL, NULL ); + WideCharToMultiByte( CP_UNIXCP, 0, msgW, -1, msg, sizeof(msg), NULL, NULL ); MESSAGE( "wine: %s", msg ); ExitProcess( error ); }

1 0

Henri Verbeet : wined3d: Move the ARB shader program constant handling to the backend where it belongs .
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 7aac0159a995e35c96d30ffed19630c0320bfc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aac0159a995e35c96d30ffed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 25 21:20:29 2011 +0200 wined3d: Move the ARB shader program constant handling to the backend where it belongs. --- dlls/wined3d/arb_program_shader.c | 106 ++++++++++++++++++++++++++++--------- dlls/wined3d/context.c | 38 +------------- dlls/wined3d/device.c | 2 - dlls/wined3d/glsl_shader.c | 8 +-- dlls/wined3d/shader.c | 4 +- dlls/wined3d/wined3d_private.h | 8 +-- 6 files changed, 89 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7aac0159a995e35c96d30…

1 0

Henri Verbeet : wined3d: Get rid of the device parameter to context_setup_target().
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 89d0d3ffd8dc0e1bb8eddb69281269a04d120c8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d0d3ffd8dc0e1bb8eddb692… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 25 21:20:28 2011 +0200 wined3d: Get rid of the device parameter to context_setup_target(). --- dlls/wined3d/context.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1def817..f11b8db 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2402,8 +2402,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de return TRUE; } -static void context_setup_target(struct wined3d_device *device, - struct wined3d_context *context, struct wined3d_surface *target) +static void context_setup_target(struct wined3d_context *context, struct wined3d_surface *target) { BOOL old_render_offscreen = context->render_offscreen, render_offscreen; @@ -2507,7 +2506,7 @@ struct wined3d_context *context_acquire(struct wined3d_device *device, struct wi } context_update_window(context); - context_setup_target(device, context, target); + context_setup_target(context, target); context_enter(context); if (!context->valid) return context;

1 0

Henri Verbeet : gdi32: Update the DC in ExtEscape().
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: aa7bbe1376535efc376a0c38083af25f47b3e6b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa7bbe1376535efc376a0c380… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 25 21:20:27 2011 +0200 gdi32: Update the DC in ExtEscape(). Specifically, X11DRV_FLUSH_GL_DRAWABLE needs correct clip rects. --- dlls/gdi32/driver.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index ea15eab..db1d268 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -1225,6 +1225,7 @@ INT WINAPI ExtEscape( HDC hdc, INT nEscape, INT cbInput, LPCSTR lpszInData, if (dc) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pExtEscape ); + update_dc( dc ); ret = physdev->funcs->pExtEscape( physdev, nEscape, cbInput, lpszInData, cbOutput, lpszOutData ); release_dc_ptr( dc ); }

1 0

Henri Verbeet : wined3d: Only check for sRGB attachability when needed in surface_load_texture().
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: a42774f0425155368af1ac056952a77ff869be0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a42774f0425155368af1ac056… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 25 21:20:26 2011 +0200 wined3d: Only check for sRGB attachability when needed in surface_load_texture(). --- dlls/wined3d/surface.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 32dafcf..63c9e33 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6030,7 +6030,6 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, static HRESULT surface_load_texture(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, const RECT *rect, BOOL srgb) { - const DWORD attach_flags = WINED3DFMT_FLAG_FBO_ATTACHABLE | WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; RECT src_rect = {0, 0, surface->resource.width, surface->resource.height}; struct wined3d_device *device = surface->resource.device; struct wined3d_context *context; @@ -6051,7 +6050,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } if (surface->flags & (SFLAG_INSRGBTEX | SFLAG_INTEXTURE) - && (surface->resource.format->flags & attach_flags) == attach_flags + && (surface->resource.format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format)) @@ -6067,7 +6066,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, } if (surface->flags & (SFLAG_INRB_MULTISAMPLE | SFLAG_INRB_RESOLVED) - && (surface->resource.format->flags & attach_flags) == attach_flags + && (!srgb || (surface->resource.format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB)) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format, NULL, surface->resource.usage, surface->resource.pool, surface->resource.format))

1 0

Henri Verbeet : wined3d: Mark a format as sRGB attachable if the internal format is the same for RGB and sRGB .
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: bc3c72f2cc6e71f7f4bcd8fdfc3ea924af3d9a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3c72f2cc6e71f7f4bcd8fdf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 25 21:20:25 2011 +0200 wined3d: Mark a format as sRGB attachable if the internal format is the same for RGB and sRGB. --- dlls/wined3d/utils.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9661eb4..f374967 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1105,6 +1105,8 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined WARN("Format %s's sRGB format is not FBO attachable.\n", debug_d3dformat(format->id)); } } + else if (status == GL_FRAMEBUFFER_COMPLETE) + format->flags |= WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; glDeleteTextures(1, &tex);

1 0

Alexandre Julliard : gdi32: Implement GdiRealizationInfo as a standard driver entry point.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 7fbb16d4ba9c4d36f6ac990e0e3823a12f1df742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbb16d4ba9c4d36f6ac990e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 21 11:40:35 2011 +0200 gdi32: Implement GdiRealizationInfo as a standard driver entry point. --- dlls/gdi32/font.c | 7 ++++--- dlls/gdi32/freetype.c | 27 +++++++++++++++------------ dlls/gdi32/gdi_private.h | 1 - 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 700fc27..cda41dc 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3397,11 +3397,12 @@ BOOL WINAPI FontIsLinked(HDC hdc) BOOL WINAPI GdiRealizationInfo(HDC hdc, realization_info_t *info) { DC *dc = get_dc_ptr(hdc); - BOOL ret = FALSE; + PHYSDEV dev; + BOOL ret; if (!dc) return FALSE; - if (dc->gdiFont) ret = WineEngRealizationInfo(dc->gdiFont, info); + dev = GET_DC_PHYSDEV( dc, pGdiRealizationInfo ); + ret = dev->funcs->pGdiRealizationInfo( dev, info ); release_dc_ptr(dc); - return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 81115ea..dee97ad 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6831,17 +6831,26 @@ BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes) } /************************************************************* - * WineEngRealizationInfo + * freetype_GdiRealizationInfo */ -BOOL WineEngRealizationInfo(GdiFont *font, realization_info_t *info) +static BOOL freetype_GdiRealizationInfo( PHYSDEV dev, void *ptr ) { - FIXME("(%p, %p): stub!\n", font, info); + struct freetype_physdev *physdev = get_freetype_dev( dev ); + realization_info_t *info = ptr; + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGdiRealizationInfo ); + return dev->funcs->pGdiRealizationInfo( dev, ptr ); + } + + FIXME("(%p, %p): stub!\n", physdev->font, info); info->flags = 1; - if(FT_IS_SCALABLE(font->ft_face)) + if(FT_IS_SCALABLE(physdev->font->ft_face)) info->flags |= 2; - info->cache_num = font->cache_num; + info->cache_num = physdev->font->cache_num; info->unknown2 = -1; return TRUE; } @@ -7141,7 +7150,7 @@ static const struct gdi_dc_funcs freetype_funcs = freetype_FontIsLinked, /* pFontIsLinked */ NULL, /* pFrameRgn */ NULL, /* pGdiComment */ - NULL, /* pGdiRealizationInfo */ + freetype_GdiRealizationInfo, /* pGdiRealizationInfo */ freetype_GetCharABCWidths, /* pGetCharABCWidths */ freetype_GetCharABCWidthsI, /* pGetCharABCWidthsI */ freetype_GetCharWidth, /* pGetCharWidth */ @@ -7285,10 +7294,4 @@ BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes) return TRUE; } -BOOL WineEngRealizationInfo(GdiFont *font, realization_info_t *info) -{ - ERR("called but we don't have FreeType\n"); - return FALSE; -} - #endif /* HAVE_FREETYPE */ diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f9c86d0..a506756 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -294,7 +294,6 @@ extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN; -extern BOOL WineEngRealizationInfo(GdiFont*, realization_info_t*) DECLSPEC_HIDDEN; extern BOOL WineEngRemoveFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; /* gdiobj.c */

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2011