Rebase against d6d0d96402b9c187877f11da173f8fbbf62ba072.

This commit is contained in:
Sebastian Lackner
2016-08-13 05:24:18 +02:00
parent c46fab6261
commit 436e1adc84
4 changed files with 6 additions and 63 deletions

View File

@@ -7919,7 +7919,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -4499,7 +4499,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w
@@ -4503,7 +4503,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w
float y_offset = context->render_offscreen
? (center_offset - (2.0f * y) - h) / h
: (center_offset - (2.0f * y) - h) / -h;
@@ -7931,7 +7931,7 @@ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
state->render_states[WINED3D_RS_ZENABLE] : WINED3D_ZB_FALSE;
float z_scale = zenable ? 2.0f : 0.0f;
float z_offset = zenable ? -1.0f : 0.0f;
@@ -5296,7 +5300,11 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d
@@ -5300,7 +5304,11 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d
break;
}
}