diff options
author | Jakob Bornecrantz <[email protected]> | 2010-04-24 14:05:59 +0100 |
---|---|---|
committer | Jakob Bornecrantz <[email protected]> | 2010-04-26 00:40:17 +0100 |
commit | 27779ddad5c61d2fc46367e1556b5e53403c2a97 (patch) | |
tree | 7ad6054cd497b955a0fdde2a36b7332e45af659a /src/gallium/state_trackers/dri/common/dri_st_api.c | |
parent | a66b391edf746a5eb0cb4aad1ff2e546df00a11d (diff) |
st/dri: Make st_framebuffer_iface the base for dri_drawable
Diffstat (limited to 'src/gallium/state_trackers/dri/common/dri_st_api.c')
-rw-r--r-- | src/gallium/state_trackers/dri/common/dri_st_api.c | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/src/gallium/state_trackers/dri/common/dri_st_api.c b/src/gallium/state_trackers/dri/common/dri_st_api.c index 6c8a7e82abe..42e0ba020ad 100644 --- a/src/gallium/state_trackers/dri/common/dri_st_api.c +++ b/src/gallium/state_trackers/dri/common/dri_st_api.c @@ -106,38 +106,27 @@ dri_st_framebuffer_flush_front(struct st_framebuffer_iface *stfbi, } /** - * Create a framebuffer from the given drawable. + * Init a framebuffer from the given drawable. */ -struct st_framebuffer_iface * -dri_create_st_framebuffer(struct dri_drawable *drawable) +void +dri_init_st_framebuffer(struct dri_drawable *drawable) { - struct st_framebuffer_iface *stfbi; - - stfbi = CALLOC_STRUCT(st_framebuffer_iface); - if (stfbi) { - stfbi->visual = &drawable->stvis; - stfbi->flush_front = dri_st_framebuffer_flush_front; - stfbi->validate = dri_st_framebuffer_validate; - stfbi->st_manager_private = (void *) drawable; - } - - return stfbi; + drawable->base.visual = &drawable->stvis; + drawable->base.flush_front = dri_st_framebuffer_flush_front; + drawable->base.validate = dri_st_framebuffer_validate; + drawable->base.st_manager_private = (void *) drawable; } /** * Destroy a framebuffer. */ void -dri_destroy_st_framebuffer(struct st_framebuffer_iface *stfbi) +dri_close_st_framebuffer(struct dri_drawable *drawable) { - struct dri_drawable *drawable = - (struct dri_drawable *) stfbi->st_manager_private; int i; for (i = 0; i < ST_ATTACHMENT_COUNT; i++) pipe_resource_reference(&drawable->textures[i], NULL); - - FREE(stfbi); } /** @@ -145,11 +134,9 @@ dri_destroy_st_framebuffer(struct st_framebuffer_iface *stfbi) * exist. */ void -dri_st_framebuffer_validate_att(struct st_framebuffer_iface *stfbi, +dri_st_framebuffer_validate_att(struct dri_drawable *drawable, enum st_attachment_type statt) { - struct dri_drawable *drawable = - (struct dri_drawable *) stfbi->st_manager_private; enum st_attachment_type statts[ST_ATTACHMENT_COUNT]; unsigned i, count = 0; @@ -167,7 +154,8 @@ dri_st_framebuffer_validate_att(struct st_framebuffer_iface *stfbi, drawable->texture_stamp = drawable->dPriv->lastStamp - 1; - stfbi->validate(stfbi, statts, count, NULL); + /* this calles into the manager */ + drawable->base.validate(&drawable->base, statts, count, NULL); } static boolean |