fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 08:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium: adjust the code in update_textures() to look more like update_samplers()

Browse source
This commit is contained in:
Brian 2008-04-04 16:44:09 -06:00
parent fe1c9c0585
commit 74a6a46b74
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/mesa/state_tracker/st_atom_texture.c
View file

@ -47,19 +47,18 @@
static void
update_textures(struct st_context *st)
{
/* ST_NEW_FRAGMENT_PROGRAM
*/
struct gl_fragment_program *fprog = st->ctx->FragmentProgram._Current;
GLuint unit;
GLuint su;
st->state.num_textures = 0;
for (unit = 0; unit < st->ctx->Const.MaxTextureCoordUnits; unit++) {
const GLuint su = fprog->Base.SamplerUnits[unit];
for (su = 0; su < st->ctx->Const.MaxTextureCoordUnits; su++) {
struct pipe_texture *pt = NULL;
if (fprog->Base.SamplersUsed & (1 << su)) {
struct gl_texture_object *texObj = st->ctx->Texture.Unit[su]._Current;
const GLuint texUnit = fprog->Base.SamplerUnits[su];
struct gl_texture_object *texObj
= st->ctx->Texture.Unit[texUnit]._Current;
struct st_texture_object *stObj = st_texture_object(texObj);
if (texObj) {
@ -71,13 +70,13 @@ update_textures(struct st_context *st)
continue;
}
st->state.num_textures = unit + 1;
st->state.num_textures = su + 1;
}
pt = st_get_stobj_texture(stObj);
}
pipe_texture_reference(&st->state.sampler_texture[unit], pt);
pipe_texture_reference(&st->state.sampler_texture[su], pt);
}
st->pipe->set_sampler_textures(st->pipe, st->state.num_textures,