diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-01 23:22:31 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-06-02 08:38:21 +0100 |
| commit | 25a17b2ca5e3945150151c4308761891c0e20bab (patch) | |
| tree | 657faa436add26b2df9fe3e865579c6d5a21dda2 /src/i965_render.c | |
| parent | ba0eb230836fa5f94a2f50da5880fdd3b9dfd72e (diff) | |
uxa: Remove 'render_source_is_solid' dead code
Reported-by: Zdenek Kabelac <zkabelac@redhat.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/i965_render.c')
| -rw-r--r-- | src/i965_render.c | 80 |
1 files changed, 39 insertions, 41 deletions
diff --git a/src/i965_render.c b/src/i965_render.c index 98231b8b..f9d31586 100644 --- a/src/i965_render.c +++ b/src/i965_render.c @@ -1847,47 +1847,45 @@ i965_emit_composite_primitive(intel_screen_private *intel, float src_x[3], src_y[3], src_w[3], mask_x[3], mask_y[3], mask_w[3]; Bool is_affine = intel->gen4_render_state->composite_op.is_affine; - if (! intel->render_source_is_solid) { - if (is_affine) { - if (!intel_get_transformed_coordinates(srcX, srcY, - intel->transform[0], - &src_x[0], - &src_y[0])) - return; - - if (!intel_get_transformed_coordinates(srcX, srcY + h, - intel->transform[0], - &src_x[1], - &src_y[1])) - return; - - if (!intel_get_transformed_coordinates(srcX + w, srcY + h, - intel->transform[0], - &src_x[2], - &src_y[2])) - return; - } else { - if (!intel_get_transformed_coordinates_3d(srcX, srcY, - intel->transform[0], - &src_x[0], - &src_y[0], - &src_w[0])) - return; - - if (!intel_get_transformed_coordinates_3d(srcX, srcY + h, - intel->transform[0], - &src_x[1], - &src_y[1], - &src_w[1])) - return; - - if (!intel_get_transformed_coordinates_3d(srcX + w, srcY + h, - intel->transform[0], - &src_x[2], - &src_y[2], - &src_w[2])) - return; - } + if (is_affine) { + if (!intel_get_transformed_coordinates(srcX, srcY, + intel->transform[0], + &src_x[0], + &src_y[0])) + return; + + if (!intel_get_transformed_coordinates(srcX, srcY + h, + intel->transform[0], + &src_x[1], + &src_y[1])) + return; + + if (!intel_get_transformed_coordinates(srcX + w, srcY + h, + intel->transform[0], + &src_x[2], + &src_y[2])) + return; + } else { + if (!intel_get_transformed_coordinates_3d(srcX, srcY, + intel->transform[0], + &src_x[0], + &src_y[0], + &src_w[0])) + return; + + if (!intel_get_transformed_coordinates_3d(srcX, srcY + h, + intel->transform[0], + &src_x[1], + &src_y[1], + &src_w[1])) + return; + + if (!intel_get_transformed_coordinates_3d(srcX + w, srcY + h, + intel->transform[0], + &src_x[2], + &src_y[2], + &src_w[2])) + return; } if (intel->render_mask) { |