OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frontend/dri: remove __DRIdrawableRec::dri2::stamp

Browse Source 
It's practically unused. It was only off by one at initialization, but
that didn't have any effect.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19741>
This commit is contained in:
Marek Olšák
2022-11-14 21:10:16 -05:00
committed by Marge Bot
parent f890714b70
commit e061affa7f
5 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/frontends/dri/dri2.c
View File

@@ -103,8 +103,7 @@ dri2_invalidate_drawable(__DRIdrawable *dPriv)
{ {
struct dri_drawable *drawable = dri_drawable(dPriv); struct dri_drawable *drawable = dri_drawable(dPriv);
dPriv->dri2.stamp++; drawable->dPriv->lastStamp++;
drawable->dPriv->lastStamp = drawable->dPriv->dri2.stamp;
drawable->texture_mask = 0; /* mark all attachments as invalid */ drawable->texture_mask = 0; /* mark all attachments as invalid */
p_atomic_inc(&drawable->base.stamp); p_atomic_inc(&drawable->base.stamp);

5
src/gallium/frontends/dri/dri_drawable.c
View File

@@ -66,11 +66,6 @@ dri_st_framebuffer_validate(struct st_context_iface *stctx,
/* record newly allocated textures */ /* record newly allocated textures */
new_mask = (statt_mask & ~drawable->texture_mask); new_mask = (statt_mask & ~drawable->texture_mask);
/*
* dPriv->dri2.stamp is the server stamp. dPriv->lastStamp is the
* client stamp. It has the value of the server stamp when last
* checked.
*/
do { do {
lastStamp = drawable->dPriv->lastStamp; lastStamp = drawable->dPriv->lastStamp;
new_stamp = (drawable->texture_stamp != lastStamp); new_stamp = (drawable->texture_stamp != lastStamp);

2
src/gallium/frontends/dri/dri_util.c
View File

@@ -850,8 +850,6 @@ driCreateNewDrawable(__DRIscreen *screen,
return NULL; return NULL;
} }
pdraw->dri2.stamp = pdraw->lastStamp + 1;
return pdraw; return pdraw;
} }

14
src/gallium/frontends/dri/dri_util.h
View File

@@ -296,22 +296,14 @@ struct __DRIdrawableRec {
int refcount; int refcount;
/** /**
* Last value of the stamp. * Increased when the loader calls invalidate.
* *
* If this differs from the value stored at __DRIdrawable::dri2.stamp, * If this changes, the drawable information (below) should be retrieved
* then the drawable information has been modified by the X server, and the * from the loader.
* drawable information (below) should be retrieved from the X server.
*/ */
unsigned int lastStamp; unsigned int lastStamp;
int w, h; int w, h;
/**
* Drawable timestamp. Increased when the loader calls invalidate.
*/
struct {
unsigned int stamp;
} dri2;
}; };
extern uint32_t extern uint32_t

2
src/gallium/frontends/dri/kopper.c
View File

@@ -993,8 +993,6 @@ kopperCreateNewDrawable(__DRIscreen *screen,
return NULL; return NULL;
} }
pdraw->dri2.stamp = pdraw->lastStamp + 1;
return pdraw; return pdraw;
} }