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

Józef Kucia : wined3d: Use GLuint instead of GLenum to store ARB blitter shaders.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 966a07149a029191d3d9ba010e5bcb8ccb8114a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=966a07149a029191d3d9ba010… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 17 11:47:15 2016 +0100 wined3d: Use GLuint instead of GLenum to store ARB blitter shaders. 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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 189a516..99c21db 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6939,7 +6939,7 @@ struct arbfp_blit_type struct arbfp_blit_desc { - GLenum shader; + GLuint shader; struct arbfp_blit_type type; struct wine_rb_entry entry; }; @@ -7393,7 +7393,7 @@ static BOOL gen_nv12_read(struct wined3d_string_buffer *buffer, const struct arb static GLuint gen_p8_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) { - GLenum shader; + GLuint shader; struct wined3d_string_buffer buffer; const char *tex_target = arbfp_texture_target(type->res_type); @@ -7482,7 +7482,7 @@ static void upload_palette(const struct wined3d_texture *texture, struct wined3d static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) { - GLenum shader; + GLuint shader; struct wined3d_string_buffer buffer; char luminance_component; @@ -7607,7 +7607,7 @@ static GLuint gen_yuv_shader(struct arbfp_blit_priv *priv, const struct wined3d_ static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, const struct wined3d_gl_info *gl_info, const struct arbfp_blit_type *type) { - GLenum shader; + GLuint shader; struct wined3d_string_buffer buffer; const char *tex_target = arbfp_texture_target(type->res_type); @@ -7661,7 +7661,7 @@ static GLuint arbfp_gen_plain_shader(struct arbfp_blit_priv *priv, static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, const struct wined3d_surface *surface, const struct wined3d_color_key *color_key) { - GLenum shader; + GLuint shader; float size[4] = {(float) surface->pow2Width, (float) surface->pow2Height, 1.0f, 1.0f}; const struct wined3d_texture *texture = surface->container; struct arbfp_blit_priv *priv = blit_priv;

1 0

Miklós Máté : winex11: Don' t create a temporary context each time X11DRV_wglBindTexImageARB is called.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: f9696eea8b1541506069e6f5a9d5fd67bb620a75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9696eea8b1541506069e6f5a… Author: Miklós Máté <mtmkls(a)gmail.com> Date: Tue Mar 15 18:58:26 2016 +0100 winex11: Don't create a temporary context each time X11DRV_wglBindTexImageARB is called. Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 8177b00..ab29ce4 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -237,6 +237,9 @@ struct wgl_pbuffer GLenum texture_type; GLuint texture; int texture_level; + GLXContext tmp_context; + GLXContext prev_context; + struct list entry; }; enum dc_gl_type @@ -275,6 +278,7 @@ static XContext gl_hwnd_context; static XContext gl_pbuffer_context; static struct list context_list = LIST_INIT( context_list ); +static struct list pbuffer_list = LIST_INIT( pbuffer_list ); static struct WineGLInfo WineGLInfo = { 0 }; static struct wgl_pixel_format *pixel_formats; static int nb_pixel_formats, nb_onscreen_formats; @@ -1812,10 +1816,19 @@ static struct wgl_context *glxdrv_wglCreateContext( HDC hdc ) */ static void glxdrv_wglDeleteContext(struct wgl_context *ctx) { + struct wgl_pbuffer *pb; + TRACE("(%p)\n", ctx); EnterCriticalSection( &context_section ); list_remove( &ctx->entry ); + LIST_FOR_EACH_ENTRY( pb, &pbuffer_list, struct wgl_pbuffer, entry ) + { + if (pb->prev_context == ctx->ctx) { + pglXDestroyContext(gdi_display, pb->tmp_context); + pb->prev_context = pb->tmp_context = NULL; + } + } LeaveCriticalSection( &context_section ); if (ctx->ctx) pglXDestroyContext( gdi_display, ctx->ctx ); @@ -2301,6 +2314,9 @@ static struct wgl_pbuffer *X11DRV_wglCreatePbufferARB( HDC hdc, int iPixelFormat SetLastError(ERROR_NO_SYSTEM_RESOURCES); goto create_failed; /* unexpected error */ } + EnterCriticalSection( &context_section ); + list_add_head( &pbuffer_list, &object->entry ); + LeaveCriticalSection( &context_section ); TRACE("->(%p)\n", object); return object; @@ -2319,7 +2335,12 @@ static BOOL X11DRV_wglDestroyPbufferARB( struct wgl_pbuffer *object ) { TRACE("(%p)\n", object); + EnterCriticalSection( &context_section ); + list_remove( &object->entry ); + LeaveCriticalSection( &context_section ); pglXDestroyPbuffer(gdi_display, object->drawable); + if (object->tmp_context) + pglXDestroyContext(gdi_display, object->tmp_context); HeapFree(GetProcessHeap(), 0, object); return GL_TRUE; } @@ -2925,7 +2946,6 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) int prev_binded_texture = 0; GLXContext prev_context; Drawable prev_drawable; - GLXContext tmp_context; prev_context = pglXGetCurrentContext(); prev_drawable = pglXGetCurrentDrawable(); @@ -2940,21 +2960,25 @@ static BOOL X11DRV_wglBindTexImageARB( struct wgl_pbuffer *object, int iBuffer ) } TRACE("drawable=%lx, context=%p\n", object->drawable, prev_context); - tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); + if (!object->tmp_context || object->prev_context != prev_context) { + if (object->tmp_context) + pglXDestroyContext(gdi_display, object->tmp_context); + object->tmp_context = pglXCreateNewContext(gdi_display, object->fmt->fbconfig, object->fmt->render_type, prev_context, True); + object->prev_context = prev_context; + } opengl_funcs.gl.p_glGetIntegerv(object->texture_bind_target, &prev_binded_texture); /* Switch to our pbuffer */ - pglXMakeCurrent(gdi_display, object->drawable, tmp_context); + pglXMakeCurrent(gdi_display, object->drawable, object->tmp_context); /* Make sure that the prev_binded_texture is set as the current texture state isn't shared between contexts. - * After that upload the pbuffer texture data. */ + * After that copy the pbuffer texture data. */ opengl_funcs.gl.p_glBindTexture(object->texture_target, prev_binded_texture); opengl_funcs.gl.p_glCopyTexImage2D(object->texture_target, 0, object->use_render_texture, 0, 0, object->width, object->height, 0); - /* Switch back to the original drawable and upload the pbuffer-texture */ + /* Switch back to the original drawable and context */ pglXMakeCurrent(gdi_display, prev_drawable, prev_context); - pglXDestroyContext(gdi_display, tmp_context); return GL_TRUE; }

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_surface_depth_fill().
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: d9ebc2e21586a20337aaf9a4056d9ff8afc8bd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9ebc2e21586a20337aaf9a40… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 16 18:16:55 2016 +0100 wined3d: Get resource info from the texture in wined3d_surface_depth_fill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dcc946c..f59dee9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -936,11 +936,13 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect) { - struct wined3d_device *device = src_surface->resource.device; + struct wined3d_texture *src_texture = src_surface->container; + struct wined3d_texture *dst_texture = dst_surface->container; + struct wined3d_device *device = src_texture->resource.device; if (!fbo_blit_supported(&device->adapter->gl_info, WINED3D_BLIT_OP_DEPTH_BLIT, - src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, - dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) + src_rect, src_texture->resource.usage, src_texture->resource.pool, src_texture->resource.format, + dst_rect, dst_texture->resource.usage, dst_texture->resource.pool, dst_texture->resource.format)) return WINED3DERR_INVALIDCALL; surface_depth_blt_fbo(device, src_surface, src_location, src_rect, dst_surface, dst_location, dst_rect);

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_download_data().
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: aa1fe8cfb1abf87d4ba11734727c82830c8934fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa1fe8cfb1abf87d4ba117347… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 16 18:16:56 2016 +0100 wined3d: Get resource info from the texture in surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f59dee9..a1a2782 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1125,11 +1125,12 @@ static const struct wined3d_surface_ops gdi_surface_ops = static void surface_download_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, DWORD dst_location) { - const struct wined3d_format *format = surface->resource.format; + struct wined3d_texture *texture = surface->container; + const struct wined3d_format *format = texture->resource.format; struct wined3d_bo_address data; /* Only support read back of converted P8 surfaces. */ - if (surface->container->flags & WINED3D_TEXTURE_CONVERTED && format->id != WINED3DFMT_P8_UINT) + if (texture->flags & WINED3D_TEXTURE_CONVERTED && format->id != WINED3DFMT_P8_UINT) { ERR("Trying to read back converted surface %p with format %s.\n", surface, debug_d3dformat(format->id)); return; @@ -1137,7 +1138,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct surface_get_memory(surface, &data, dst_location); - if (surface->container->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) + if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) { TRACE("(%p) : Calling glGetCompressedTexImage level %d, format %#x, type %#x, data %p.\n", surface, surface->texture_level, format->glFormat, format->glType, data.addr); @@ -1166,10 +1167,10 @@ static void surface_download_data(struct wined3d_surface *surface, const struct GLenum gl_type = format->glType; void *mem; - if (surface->container->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { - wined3d_texture_get_pitch(surface->container, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); - wined3d_format_calculate_pitch(format, surface->resource.device->surface_alignment, + wined3d_texture_get_pitch(texture, surface->texture_level, &dst_row_pitch, &dst_slice_pitch); + wined3d_format_calculate_pitch(format, texture->resource.device->surface_alignment, surface->pow2Width, surface->pow2Height, &src_row_pitch, &src_slice_pitch); mem = HeapAlloc(GetProcessHeap(), 0, src_slice_pitch); } @@ -1200,7 +1201,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct checkGLcall("glGetTexImage"); } - if (surface->container->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) + if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) { const BYTE *src_data; BYTE *dst_data;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in wined3d_surface_upload_data().
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 55165bf6d0d178613039121caf62f5a50b7d6390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55165bf6d0d178613039121ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 16 18:16:57 2016 +0100 wined3d: Get resource info from the texture in wined3d_surface_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a1a2782..6b0a582 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1273,6 +1273,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point, BOOL srgb, const struct wined3d_const_bo_address *data) { + struct wined3d_texture *texture = surface->container; UINT update_w = src_rect->right - src_rect->left; UINT update_h = src_rect->bottom - src_rect->top; @@ -1283,7 +1284,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w if (surface->resource.map_count) { WARN("Uploading a surface that is currently mapped, setting WINED3D_TEXTURE_PIN_SYSMEM.\n"); - surface->container->flags |= WINED3D_TEXTURE_PIN_SYSMEM; + texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM; } if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_HEIGHT_SCALE) @@ -1310,8 +1311,8 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w if (srgb) internal = format->glGammaInternal; - else if (surface->resource.usage & WINED3DUSAGE_RENDERTARGET - && wined3d_resource_is_offscreen(&surface->container->resource)) + else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET + && wined3d_resource_is_offscreen(&texture->resource)) internal = format->rtInternal; else internal = format->glInternal; @@ -1370,7 +1371,7 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w if (gl_info->quirks & WINED3D_QUIRK_FBO_TEX_UPDATE) { - struct wined3d_device *device = surface->resource.device; + struct wined3d_device *device = texture->resource.device; unsigned int i; for (i = 0; i < device->context_count; ++i)

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_upload_from_surface().
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: be662a6f74bb155c7408dc249222f5f7c6d952b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be662a6f74bb155c7408dc249… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 16 18:16:58 2016 +0100 wined3d: Get resource info from the texture in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6b0a582..4423f99 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1391,6 +1391,8 @@ static BOOL surface_check_block_align_rect(struct wined3d_surface *surface, cons HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) { + struct wined3d_texture *src_texture = src_surface->container; + struct wined3d_texture *dst_texture = dst_surface->container; unsigned int src_row_pitch, src_slice_pitch; const struct wined3d_format *src_format; const struct wined3d_format *dst_format; @@ -1407,10 +1409,10 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P dst_surface, wine_dbgstr_point(dst_point), src_surface, wine_dbgstr_rect(src_rect)); - src_format = src_surface->resource.format; - dst_format = dst_surface->resource.format; - src_fmt_flags = src_surface->container->resource.format_flags; - dst_fmt_flags = dst_surface->container->resource.format_flags; + src_format = src_texture->resource.format; + dst_format = dst_texture->resource.format; + src_fmt_flags = src_texture->resource.format_flags; + dst_fmt_flags = dst_texture->resource.format_flags; if (src_format->id != dst_format->id) { @@ -1469,23 +1471,23 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P } /* Use wined3d_surface_blt() instead of uploading directly if we need conversion. */ - if (dst_format->convert || wined3d_format_get_color_key_conversion(dst_surface->container, FALSE)) + if (dst_format->convert || wined3d_format_get_color_key_conversion(dst_texture, FALSE)) return wined3d_surface_blt(dst_surface, &dst_rect, src_surface, src_rect, 0, NULL, WINED3D_TEXF_POINT); - context = context_acquire(dst_surface->resource.device, NULL); + context = context_acquire(dst_texture->resource.device, NULL); gl_info = context->gl_info; /* Only load the surface for partial updates. For newly allocated texture * the texture wouldn't be the current location, and we'd upload zeroes * just to overwrite them again. */ if (update_w == dst_w && update_h == dst_h) - wined3d_texture_prepare_texture(dst_surface->container, context, FALSE); + wined3d_texture_prepare_texture(dst_texture, context, FALSE); else surface_load_location(dst_surface, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_bind_and_dirtify(dst_surface->container, context, FALSE); + wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); surface_get_memory(src_surface, &data, src_surface->locations); - wined3d_texture_get_pitch(src_surface->container, src_surface->texture_level, &src_row_pitch, &src_slice_pitch); + wined3d_texture_get_pitch(src_texture, src_surface->texture_level, &src_row_pitch, &src_slice_pitch); wined3d_surface_upload_data(dst_surface, gl_info, src_format, src_rect, src_row_pitch, dst_point, FALSE, wined3d_const_bo_address(&data));

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_set_compatible_renderbuffer ().
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 2b40957a1a895ec9508b5b0a9ea37977384cae9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b40957a1a895ec9508b5b0a9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 16 18:16:59 2016 +0100 wined3d: Get resource info from the texture in surface_set_compatible_renderbuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4423f99..ae89aef 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1506,13 +1506,13 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P /* Context activation is done by the caller. */ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) { - const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; + const struct wined3d_gl_info *gl_info = &surface->container->resource.device->adapter->gl_info; struct wined3d_renderbuffer_entry *entry; GLuint renderbuffer = 0; unsigned int src_width, src_height; unsigned int width, height; - if (rt && rt->resource.format->id != WINED3DFMT_NULL) + if (rt && rt->container->resource.format->id != WINED3DFMT_NULL) { width = rt->pow2Width; height = rt->pow2Height; @@ -1553,7 +1553,7 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const gl_info->fbo_ops.glGenRenderbuffers(1, &renderbuffer); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer); gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, - surface->resource.format->glInternal, width, height); + surface->container->resource.format->glInternal, width, height); entry = HeapAlloc(GetProcessHeap(), 0, sizeof(*entry)); entry->width = width;

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_load().
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: ab1ae265201a0620297e5d6afb0d98a30c31a20b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab1ae265201a0620297e5d6af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 16 18:17:00 2016 +0100 wined3d: Get resource info from the texture in surface_load(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ae89aef..3aeabed 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1606,7 +1606,7 @@ void surface_load(struct wined3d_surface *surface, struct wined3d_context *conte TRACE("surface %p, srgb %#x.\n", surface, srgb); - if (surface->resource.pool == WINED3D_POOL_SCRATCH) + if (surface->container->resource.pool == WINED3D_POOL_SCRATCH) ERR("Not supported on scratch surfaces.\n"); if (surface->locations & location)

1 0

Stefan Dösinger : wined3d: Get rid of state access in shader_generate_glsl_declarations().
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: f08896aa738fcf99fd03292002bffdf3adad9311 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f08896aa738fcf99fd0329200… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 16 18:17:01 2016 +0100 wined3d: Get rid of state access in shader_generate_glsl_declarations(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 92a5b1c..d9311b9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1646,11 +1646,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont const struct wined3d_shader_reg_maps *reg_maps, const struct shader_glsl_ctx_priv *ctx_priv) { const struct wined3d_shader_version *version = &reg_maps->shader_version; - const struct wined3d_state *state = &shader->device->state; const struct vs_compile_args *vs_args = ctx_priv->cur_vs_args; const struct ps_compile_args *ps_args = ctx_priv->cur_ps_args; const struct wined3d_gl_info *gl_info = context->gl_info; - const struct wined3d_fb_state *fb = &shader->device->fb; unsigned int i, extra_constants_needed = 0; const struct wined3d_shader_lconst *lconst; const char *prefix; @@ -1953,7 +1951,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont { UINT in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input); - if (use_vs(state)) + if (ps_args->vp_mode == vertexshader) declare_in_varying(gl_info, buffer, FALSE, "vec4 %s_link[%u];\n", prefix, in_count); shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); } @@ -1986,32 +1984,13 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } if (reg_maps->vpos || reg_maps->usesdsy) { - if (shader->limits->constant_float + extra_constants_needed - + 1 < gl_info->limits.glsl_ps_float_constants) - { - shader_addline(buffer, "uniform vec4 ycorrection;\n"); - extra_constants_needed++; - } - else - { - float ycorrection[] = - { - context->render_offscreen ? 0.0f : fb->render_targets[0]->height, - context->render_offscreen ? 1.0f : -1.0f, - 0.0f, - 0.0f, - }; - - /* This happens because we do not have proper tracking of the - * constant registers that are actually used, only the max - * limit of the shader version. */ - FIXME("Cannot find a free uniform for vpos correction params\n"); - shader_addline(buffer, "const vec4 ycorrection = "); - shader_glsl_append_imm_vec4(buffer, ycorrection); - shader_addline(buffer, ";\n"); - } + ++extra_constants_needed; + shader_addline(buffer, "uniform vec4 ycorrection;\n"); shader_addline(buffer, "vec4 vpos;\n"); } + + if (shader->limits->constant_float + extra_constants_needed >= gl_info->limits.glsl_ps_float_constants) + FIXME("Insufficient uniforms to run this shader.\n"); } /* Declare output register temporaries */

1 0

Piotr Caban : msvcr80: Add _CreateFrameInfo implementation.
by Alexandre Julliard 17 Mar '16

17 Mar '16

Module: wine Branch: master Commit: 020451740158aa6bdb8e8f3b4f9af899ca615d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=020451740158aa6bdb8e8f3b4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 16 21:01:50 2016 +0100 msvcr80: Add _CreateFrameInfo implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except.c | 15 +++++++++++++++ dlls/msvcrt/except_i386.c | 7 +++++++ dlls/msvcrt/msvcrt.h | 8 +++++++- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 12 files changed, 38 insertions(+), 10 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 8674f44..619425f 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stub _CreateFrameInfo +@ cdecl _CreateFrameInfo(ptr ptr) ucrtbase._CreateFrameInfo @ stdcall _CxxThrowException(long long) ucrtbase._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() ucrtbase._EH_prolog @ stub _FindAndUnlinkFrame diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 15a446f..7d6886a 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -522,7 +522,7 @@ @ cdecl -arch=i386 _CItanh() @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) -@ stub _CreateFrameInfo +@ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(long long) @ cdecl -arch=i386 -norelay _EH_prolog() @ stub _FindAndUnlinkFrame diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index ccc659f..73b84e7 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -842,7 +842,7 @@ @ cdecl -arch=i386 _CItanh() @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) -@ stub _CreateFrameInfo +@ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(long long) @ cdecl -arch=i386 -norelay _EH_prolog() @ stub -arch=arm _FPE_Raise diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5f17e06..7b274c9 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -825,7 +825,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) @ stub _Cbuild -@ stub _CreateFrameInfo +@ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(long long) @ cdecl -arch=i386 -norelay _EH_prolog() @ stub -arch=arm _FPE_Raise diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index e978d20..dffe875 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -819,7 +819,7 @@ @ cdecl -arch=i386 _CItan() msvcr120._CItan @ cdecl -arch=i386 _CItanh() msvcr120._CItanh @ stub _Cbuild -@ stub _CreateFrameInfo +@ cdecl _CreateFrameInfo(ptr ptr) msvcr120._CreateFrameInfo @ stdcall _CxxThrowException(long long) msvcr120._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() msvcr120._EH_prolog @ stub -arch=arm _FPE_Raise diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4df2215..1035b62 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -152,7 +152,7 @@ @ cdecl -arch=i386 _CItanh() @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) -@ stub _CreateFrameInfo +@ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(long long) @ cdecl -arch=i386 -norelay _EH_prolog() @ stub _FindAndUnlinkFrame diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 4bb2adb..cac6775 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -149,7 +149,7 @@ @ cdecl -arch=i386 _CItanh() @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) -@ stub _CreateFrameInfo +@ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(long long) @ cdecl -arch=i386 -norelay _EH_prolog() @ stub _FindAndUnlinkFrame diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index f5c8b03..a204d62 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -326,3 +326,18 @@ LPTOP_LEVEL_EXCEPTION_FILTER CDECL MSVCR110__crtSetUnhandledExceptionFilter(LPTO { return SetUnhandledExceptionFilter(filter); } + +/********************************************************************* + * _CreateFrameInfo (MSVCR80.@) + */ +frame_info* CDECL _CreateFrameInfo(frame_info *fi, void *obj) +{ + thread_data_t *data = msvcrt_get_thread_data(); + + TRACE("(%p, %p)\n", fi, obj); + + fi->next = data->frame_info_head; + data->frame_info_head = fi; + fi->object = obj; + return fi; +} diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 78ce488..4569572 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -414,6 +414,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG BOOL __cdecl _IsExceptionObjectToBeDestroyed(const void *obj) { EXCEPTION_REGISTRATION_RECORD *reg = NtCurrentTeb()->Tib.ExceptionList; + frame_info *cur; TRACE( "%p\n", obj ); @@ -432,6 +433,12 @@ BOOL __cdecl _IsExceptionObjectToBeDestroyed(const void *obj) reg = reg->Prev; } + for (cur = msvcrt_get_thread_data()->frame_info_head; cur; cur = cur->next) + { + if (cur->object == obj) + return FALSE; + } + return TRUE; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index aff1741..64a7ab9 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -204,6 +204,11 @@ typedef struct MSVCRT_localeinfo_struct MSVCRT_pthreadmbcinfo mbcinfo; } MSVCRT__locale_tstruct, *MSVCRT__locale_t; +typedef struct _frame_info +{ + void *object; + struct _frame_info *next; +} frame_info; /* TLS data */ extern DWORD msvcrt_tls_index DECLSPEC_HIDDEN; @@ -242,7 +247,8 @@ struct __thread_data { void *unk6[3]; int unk7; EXCEPTION_RECORD *exc_record; - void *unk8[7]; + frame_info *frame_info_head; + void *unk8[6]; LCID cached_lcid; int unk9[3]; DWORD cached_cp; diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 16540a5..df7c02e 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -17,7 +17,7 @@ @ stub _Cbuild @ stub _Cmulcc @ stub _Cmulcr -@ stub _CreateFrameInfo +@ cdecl _CreateFrameInfo(ptr ptr) @ stdcall _CxxThrowException(long long) @ cdecl -arch=i386 -norelay _EH_prolog() @ stub _Exit diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index c518b15..c5e0c4f 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -1,4 +1,4 @@ -@ stub _CreateFrameInfo +@ cdecl _CreateFrameInfo(ptr ptr) ucrtbase._CreateFrameInfo @ stdcall _CxxThrowException(long long) ucrtbase._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() ucrtbase._EH_prolog @ stub _FindAndUnlinkFrame

1 0