diff options
| -rw-r--r-- | src/i965_render.c | 80 | ||||
| -rw-r--r-- | src/intel.h | 2 |
2 files changed, 39 insertions, 43 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) { diff --git a/src/intel.h b/src/intel.h index 253a6bf9..4bdeab31 100644 --- a/src/intel.h +++ b/src/intel.h @@ -268,8 +268,6 @@ typedef struct intel_screen_private { PixmapPtr render_source, render_mask, render_dest; PicturePtr render_source_picture, render_mask_picture, render_dest_picture; - CARD32 render_source_solid; - Bool render_source_is_solid; Bool needs_3d_invariant; Bool needs_render_state_emit; Bool needs_render_vertex_emit; |