Rebase against 7ce384c4153112201aa263da6dee15fed21a4e06.

This commit is contained in:
Sebastian Lackner
2016-10-14 23:49:07 +02:00
parent 0f6b6615d9
commit 70bc9a4e63
4 changed files with 18 additions and 18 deletions

View File

@@ -54,7 +54,7 @@ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader
/* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active
* context. On a context switch the old context will be fully dirtified */
@@ -4724,7 +4744,11 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context
@@ -4727,7 +4747,11 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context
}
else
{
@@ -66,7 +66,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);
}
@@ -7984,8 +8008,16 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_
@@ -7987,8 +8011,16 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_
/* Leave the opengl state valid for blitting */
arbfp_blit_unset(context->gl_info);