wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 1e8759805e3c5dfe00a31bb5f13f1c1da28d2826.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-05-21 06:24:11 +02:00
parent f09433417e
commit b2297b41c3
24 changed files with 255 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

@@ -1199,7 +1199,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader
/* Load DirectX 9 float constants for pixel shader */
priv->highest_dirty_ps_const = shader_arb_load_constantsF(pshader, gl_info, GL_FRAGMENT_PROGRAM_ARB,
@@ -4652,7 +4656,11 @@
@@ -4694,7 +4698,11 @@
}
else
{
@@ -1211,7 +1211,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader
shader_arb_ps_local_constants(compiled, context, state, rt_height);
}
@@ -7766,7 +7774,11 @@
@@ -7810,7 +7818,11 @@
/* Now load the surface */
if (wined3d_settings.offscreen_rendering_mode != ORM_FBO
@@ -1223,7 +1223,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader
== WINED3D_LOCATION_DRAWABLE
&& !wined3d_resource_is_offscreen(&src_surface->container->resource))
{
@@ -7796,6 +7808,7 @@
@@ -7840,6 +7852,7 @@
/* Leave the opengl state valid for blitting */
arbfp_blit_unset(context->gl_info);
@@ -1231,7 +1231,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader
if (wined3d_settings.cs_multithreaded)
context->gl_info->gl_ops.gl.p_glFinish();
else if (wined3d_settings.strict_draw_ordering
@@ -7807,6 +7820,17 @@
@@ -7851,6 +7864,17 @@
wined3d_resource_validate_location(&dst_surface->resource, dst_surface->container->resource.draw_binding);
wined3d_resource_invalidate_location(&dst_surface->resource, ~dst_surface->container->resource.draw_binding);