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

gallium: check SamplersUsed to determine if texture needed, as in st_atom_sampler.c

Browse Source 
Otherwise, we were sometimes setting texture state but not the corresponding
sampler state.
This commit is contained in:
Brian Paul
2008-03-24 12:59:54 -06:00
parent ae146e4bc8
commit 762e96c804
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/mesa/state_tracker/st_atom_texture.c
View File

@@ -56,28 +56,27 @@ update_textures(struct st_context *st)
for (unit = 0; unit < st->ctx->Const.MaxTextureCoordUnits; unit++) { for (unit = 0; unit < st->ctx->Const.MaxTextureCoordUnits; unit++) {
const GLuint su = fprog->Base.SamplerUnits[unit]; const GLuint su = fprog->Base.SamplerUnits[unit];
struct gl_texture_object *texObj = st->ctx->Texture.Unit[su]._Current; struct pipe_texture *pt = NULL;
struct st_texture_object *stObj = st_texture_object(texObj);
struct pipe_texture *pt;
if (texObj) { if (fprog->Base.SamplersUsed & (1 << su)) {
GLboolean flush, retval; struct gl_texture_object *texObj = st->ctx->Texture.Unit[su]._Current;
struct st_texture_object *stObj = st_texture_object(texObj);
retval = st_finalize_texture(st->ctx, st->pipe, texObj, &flush); if (texObj) {
if (!retval) { GLboolean flush, retval;
/* out of mem */
continue; retval = st_finalize_texture(st->ctx, st->pipe, texObj, &flush);
if (!retval) {
/* out of mem */
continue;
}
st->state.num_textures = unit + 1;
} }
st->state.num_textures = unit + 1; pt = st_get_stobj_texture(stObj);
} }
/* XXX: need to ensure that textures are unbound/removed from
* this table before being deleted, otherwise the pointer
* comparison below could fail.
*/
pt = st_get_stobj_texture(stObj);
pipe_texture_reference(&st->state.sampler_texture[unit], pt); pipe_texture_reference(&st->state.sampler_texture[unit], pt);
} }