fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 13:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/dri: make get_texture into validate_att

Browse source 
This is a wrapper around dri_st_framebuffer_validate for a single attachment.
Also, call validate through hook to make it more generic.
This commit is contained in:
George Sapountzis 2010-03-25 17:01:52 +02:00
parent a21c30308d
commit 96c152b4b0
3 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gallium/state_trackers/dri/dri_drawable.c
View file

@ -48,8 +48,11 @@ void dri2_set_tex_buffer2(__DRIcontext *pDRICtx, GLint target,
{
struct dri_context *ctx = dri_context(pDRICtx);
struct dri_drawable *drawable = dri_drawable(dPriv);
struct pipe_texture *pt =
dri_get_st_framebuffer_texture(drawable->stfb, ST_ATTACHMENT_FRONT_LEFT);
struct pipe_texture *pt;
dri_st_framebuffer_validate_att(drawable->stfb, ST_ATTACHMENT_FRONT_LEFT);
pt = drawable->textures[ST_ATTACHMENT_FRONT_LEFT];
if (pt) {
ctx->st->teximage(ctx->st,

36
src/gallium/state_trackers/dri/dri_st_api.c
View file

@ -390,33 +390,33 @@ dri_destroy_st_framebuffer(struct st_framebuffer_iface *stfbi)
}
/**
* Return the texture at an attachment. Allocate the texture if it does not
* Validate the texture at an attachment. Allocate the texture if it does not
* exist.
*/
struct pipe_texture *
dri_get_st_framebuffer_texture(struct st_framebuffer_iface *stfbi,
enum st_attachment_type statt)
void
dri_st_framebuffer_validate_att(struct st_framebuffer_iface *stfbi,
enum st_attachment_type statt)
{
struct dri_drawable *drawable =
(struct dri_drawable *) stfbi->st_manager_private;
if (!(drawable->texture_mask & (1 << statt))) {
enum st_attachment_type statts[ST_ATTACHMENT_COUNT];
unsigned i, count = 0;
enum st_attachment_type statts[ST_ATTACHMENT_COUNT];
unsigned i, count = 0;
/* make sure DRI2 does not destroy existing buffers */
for (i = 0; i < ST_ATTACHMENT_COUNT; i++) {
if (drawable->texture_mask & (1 << i)) {
statts[count++] = i;
}
/* check if buffer already exists */
if (drawable->texture_mask & (1 << statt))
return;
/* make sure DRI2 does not destroy existing buffers */
for (i = 0; i < ST_ATTACHMENT_COUNT; i++) {
if (drawable->texture_mask & (1 << i)) {
statts[count++] = i;
}
statts[count++] = statt;
drawable->texture_stamp = drawable->dPriv->lastStamp - 1;
dri_st_framebuffer_validate(stfbi, statts, count, NULL);
}
statts[count++] = statt;
return drawable->textures[statt];
drawable->texture_stamp = drawable->dPriv->lastStamp - 1;
stfbi->validate(stfbi, statts, count, NULL);
}
/**

6
src/gallium/state_trackers/dri/dri_st_api.h
View file

@ -48,8 +48,8 @@ dri_create_st_framebuffer(struct dri_drawable *drawable);
void
dri_destroy_st_framebuffer(struct st_framebuffer_iface *stfbi);
struct pipe_texture *
dri_get_st_framebuffer_texture(struct st_framebuffer_iface *stfbi,
enum st_attachment_type statt);
void
dri_st_framebuffer_validate_att(struct st_framebuffer_iface *stfbi,
enum st_attachment_type statt);
#endif /* _DRI_ST_API_H_ */