diff options
Diffstat (limited to 'src/i965_render.c')
| -rw-r--r-- | src/i965_render.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/i965_render.c b/src/i965_render.c index 1402d148..37a7ab73 100644 --- a/src/i965_render.c +++ b/src/i965_render.c @@ -35,7 +35,7 @@ #include <assert.h> #include "xf86.h" -#include "i830.h" +#include "intel.h" #include "i830_reg.h" #include "i965_reg.h" @@ -1071,7 +1071,7 @@ i965_set_picture_surface_state(intel_screen_private *intel, { struct brw_surface_state_padded *ss; struct brw_surface_state local_ss; - struct intel_pixmap *priv = i830_get_pixmap_intel(pixmap); + struct intel_pixmap *priv = intel_get_pixmap_private(pixmap); ss = (struct brw_surface_state_padded *)ss_bo->virtual + ss_index; @@ -1107,9 +1107,9 @@ i965_set_picture_surface_state(intel_screen_private *intel, local_ss.ss2.render_target_rotation = 0; local_ss.ss2.height = pixmap->drawable.height - 1; local_ss.ss2.width = pixmap->drawable.width - 1; - local_ss.ss3.pitch = intel_get_pixmap_pitch(pixmap) - 1; + local_ss.ss3.pitch = intel_pixmap_pitch(pixmap) - 1; local_ss.ss3.tile_walk = 0; /* Tiled X */ - local_ss.ss3.tiled_surface = i830_pixmap_tiled(pixmap) ? 1 : 0; + local_ss.ss3.tiled_surface = intel_pixmap_tiled(pixmap) ? 1 : 0; memcpy(ss, &local_ss, sizeof(local_ss)); @@ -1163,7 +1163,7 @@ static void i965_emit_composite_state(ScrnInfoPtr scrn) /* Mark the destination dirty within this batch */ intel_batch_mark_pixmap_domains(intel, - i830_get_pixmap_intel(dest), + intel_get_pixmap_private(dest), I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER); @@ -1552,8 +1552,8 @@ i965_prepare_composite(int op, PicturePtr source_picture, } /* Flush any pending writes prior to relocating the textures. */ - if(i830_uxa_pixmap_is_dirty(source) || - (mask && i830_uxa_pixmap_is_dirty(mask))) + if (intel_pixmap_is_dirty(source) || + (mask && intel_pixmap_is_dirty(mask))) intel_batch_emit_flush(scrn); @@ -1632,7 +1632,7 @@ i965_prepare_composite(int op, PicturePtr source_picture, intel->scale_units[0][1] = source->drawable.height; intel->transform[0] = source_picture->transform; - composite_op->is_affine = i830_transform_is_affine(intel->transform[0]); + composite_op->is_affine = intel_transform_is_affine(intel->transform[0]); if (!mask) { intel->transform[1] = NULL; @@ -1643,7 +1643,7 @@ i965_prepare_composite(int op, PicturePtr source_picture, intel->scale_units[1][0] = mask->drawable.width; intel->scale_units[1][1] = mask->drawable.height; composite_op->is_affine &= - i830_transform_is_affine(intel->transform[1]); + intel_transform_is_affine(intel->transform[1]); } if (mask) { @@ -1735,30 +1735,30 @@ i965_composite(PixmapPtr dest, int srcX, int srcY, int maskX, int maskY, Bool is_affine = render_state->composite_op.is_affine; if (is_affine) { - if (!i830_get_transformed_coordinates(srcX, srcY, + if (!intel_get_transformed_coordinates(srcX, srcY, intel->transform[0], &src_x[0], &src_y[0])) return; - if (!i830_get_transformed_coordinates(srcX, srcY + h, + if (!intel_get_transformed_coordinates(srcX, srcY + h, intel->transform[0], &src_x[1], &src_y[1])) return; - if (!i830_get_transformed_coordinates(srcX + w, srcY + h, + if (!intel_get_transformed_coordinates(srcX + w, srcY + h, intel->transform[0], &src_x[2], &src_y[2])) return; } else { - if (!i830_get_transformed_coordinates_3d(srcX, srcY, + if (!intel_get_transformed_coordinates_3d(srcX, srcY, intel->transform[0], &src_x[0], &src_y[0], &src_w[0])) return; - if (!i830_get_transformed_coordinates_3d(srcX, srcY + h, + if (!intel_get_transformed_coordinates_3d(srcX, srcY + h, intel->transform[0], &src_x[1], &src_y[1], &src_w[1])) return; - if (!i830_get_transformed_coordinates_3d(srcX + w, srcY + h, + if (!intel_get_transformed_coordinates_3d(srcX + w, srcY + h, intel->transform[0], &src_x[2], &src_y[2], &src_w[2])) @@ -1770,35 +1770,35 @@ i965_composite(PixmapPtr dest, int srcX, int srcY, int maskX, int maskY, } else { has_mask = TRUE; if (is_affine) { - if (!i830_get_transformed_coordinates(maskX, maskY, + if (!intel_get_transformed_coordinates(maskX, maskY, intel-> transform[1], &mask_x[0], &mask_y[0])) return; - if (!i830_get_transformed_coordinates(maskX, maskY + h, + if (!intel_get_transformed_coordinates(maskX, maskY + h, intel-> transform[1], &mask_x[1], &mask_y[1])) return; - if (!i830_get_transformed_coordinates + if (!intel_get_transformed_coordinates (maskX + w, maskY + h, intel->transform[1], &mask_x[2], &mask_y[2])) return; } else { - if (!i830_get_transformed_coordinates_3d(maskX, maskY, + if (!intel_get_transformed_coordinates_3d(maskX, maskY, intel-> transform[1], &mask_x[0], &mask_y[0], &mask_w[0])) return; - if (!i830_get_transformed_coordinates_3d + if (!intel_get_transformed_coordinates_3d (maskX, maskY + h, intel->transform[1], &mask_x[1], &mask_y[1], &mask_w[1])) return; - if (!i830_get_transformed_coordinates_3d + if (!intel_get_transformed_coordinates_3d (maskX + w, maskY + h, intel->transform[1], &mask_x[2], &mask_y[2], &mask_w[2])) return; |