Rebase against a875e3c6ab075c0603e7bf1430abdba704640602.

This commit is contained in:
Sebastian Lackner
2016-08-25 23:20:12 +02:00
parent 9961dd76da
commit f2fd04974f
3 changed files with 14 additions and 14 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
@@ -4503,7 +4503,11 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w
@@ -4527,7 +4527,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;
@@ -5300,7 +5304,11 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d
@@ -5324,7 +5328,11 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d
break;
}
}