Rebase against f669dc69cdcaf08aa197c98f68a1dfb4f8a265b1.

This commit is contained in:
Sebastian Lackner
2016-09-28 03:28:26 +02:00
parent 78c9cb74ff
commit b3eb9ef535
6 changed files with 28 additions and 28 deletions

View File

@@ -4903,7 +4903,7 @@ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -1495,7 +1495,11 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
@@ -1514,7 +1514,11 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
const struct wined3d_vec4 correction_params =
{
/* Position is relative to the framebuffer, not the viewport. */
@@ -4915,7 +4915,7 @@ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
context->render_offscreen ? 1.0f : -1.0f,
0.0f,
0.0f,
@@ -1601,6 +1605,13 @@ static void shader_glsl_update_float_vertex_constants(struct wined3d_device *dev
@@ -1620,6 +1624,13 @@ static void shader_glsl_update_float_vertex_constants(struct wined3d_device *dev
{
update_heap_entry(heap, i, priv->next_constant_version);
}
@@ -4929,7 +4929,7 @@ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
}
static void shader_glsl_update_float_pixel_constants(struct wined3d_device *device, UINT start, UINT count)
@@ -1613,6 +1624,13 @@ static void shader_glsl_update_float_pixel_constants(struct wined3d_device *devi
@@ -1632,6 +1643,13 @@ static void shader_glsl_update_float_pixel_constants(struct wined3d_device *devi
{
update_heap_entry(heap, i, priv->next_constant_version);
}