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 dcc6868057605296a7dacd89211e0673396abe45.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-08-26 17:59:16 +02:00
parent 074eae4371
commit c2bac3f03f
18 changed files with 9 additions and 3408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1252,7 +1252,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,
@@ -4702,7 +4706,11 @@
@@ -4712,7 +4716,11 @@
}
else
{
@@ -1264,7 +1264,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);
}
@@ -7839,7 +7847,11 @@
@@ -7849,7 +7857,11 @@
/* Now load the surface */
if (wined3d_settings.offscreen_rendering_mode != ORM_FBO
@@ -1276,7 +1276,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))
{
@@ -7869,6 +7881,7 @@
@@ -7879,6 +7891,7 @@
/* Leave the opengl state valid for blitting */
arbfp_blit_unset(context->gl_info);
@@ -1284,7 +1284,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
@@ -7880,6 +7893,17 @@
@@ -7890,6 +7903,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);
@@ -9479,8 +9479,8 @@ diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c
+ */
+#endif /* STAGING_CSMT */
*dst_color = 0;
*dst_color |= (src_color & 0xff00ff00); /* Alpha Green */
*dst_color |= (src_color & 0x00ff0000) >> 16; /* Red */
*dst_color |= (src_color & 0xff00ff00u); /* Alpha Green */
*dst_color |= (src_color & 0x00ff0000u) >> 16; /* Red */
@@ -457,8 +494,12 @@
data->buffer_object = buffer->buffer_object;
if (!buffer->buffer_object)