From e9beaf65fdaf82a7845cbe176f353ddb6b8466c7 Mon Sep 17 00:00:00 2001 From: Kristian Høgsberg Date: Fri, 28 Oct 2011 16:22:03 -0400 Subject: dri: Remove unnecessary timestamp pointer indirection --- src/gallium/state_trackers/dri/common/dri_drawable.c | 6 +++--- src/gallium/state_trackers/dri/drm/dri2.c | 2 +- src/gallium/state_trackers/dri/sw/dri_drawable.c | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) delete mode 120000 src/gallium/state_trackers/dri/sw/dri_drawable.c (limited to 'src/gallium/state_trackers') diff --git a/src/gallium/state_trackers/dri/common/dri_drawable.c b/src/gallium/state_trackers/dri/common/dri_drawable.c index 485616fde6c..d8db69e7f04 100644 --- a/src/gallium/state_trackers/dri/common/dri_drawable.c +++ b/src/gallium/state_trackers/dri/common/dri_drawable.c @@ -62,9 +62,9 @@ dri_st_framebuffer_validate(struct st_framebuffer_iface *stfbi, new_mask = (statt_mask & ~drawable->texture_mask); /* - * dPriv->pStamp is the server stamp. It should be accessed with a lock, at - * least for DRI1. dPriv->lastStamp is the client stamp. It has the value - * of the server stamp when last checked. + * dPriv->dri2.stamp is the server stamp. dPriv->lastStamp is the + * client stamp. It has the value of the server stamp when last + * checked. */ new_stamp = (drawable->texture_stamp != drawable->dPriv->lastStamp); diff --git a/src/gallium/state_trackers/dri/drm/dri2.c b/src/gallium/state_trackers/dri/drm/dri2.c index d3db0ccda51..a62a084c13f 100644 --- a/src/gallium/state_trackers/dri/drm/dri2.c +++ b/src/gallium/state_trackers/dri/drm/dri2.c @@ -65,7 +65,7 @@ dri2_invalidate_drawable(__DRIdrawable *dPriv) struct dri_drawable *drawable = dri_drawable(dPriv); dri2InvalidateDrawable(dPriv); - drawable->dPriv->lastStamp = *drawable->dPriv->pStamp; + drawable->dPriv->lastStamp = drawable->dPriv->dri2.stamp; p_atomic_inc(&drawable->base.stamp); } diff --git a/src/gallium/state_trackers/dri/sw/dri_drawable.c b/src/gallium/state_trackers/dri/sw/dri_drawable.c deleted file mode 120000 index 0fc19be6ea6..00000000000 --- a/src/gallium/state_trackers/dri/sw/dri_drawable.c +++ /dev/null @@ -1 +0,0 @@ -../common/dri_drawable.c \ No newline at end of file -- cgit v1.2.3