fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-18 06:10:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

mesa: use _mesa_get_current_tex_unit() helper

Browse source
This commit is contained in:
Brian Paul 2009-09-28 09:22:33 -06:00
parent 6920a355c1
commit eb82373abb
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/mesa/main/enable.c
View file

@ -37,6 +37,7 @@
#include "mtypes.h"
#include "enums.h"
#include "api_arrayelt.h"
#include "texstate.h"
@ -228,8 +229,7 @@ get_texcoord_unit(GLcontext *ctx)
static GLboolean
enable_texture(GLcontext *ctx, GLboolean state, GLbitfield texBit)
{
const GLuint curr = ctx->Texture.CurrentUnit;
struct gl_texture_unit *texUnit = &ctx->Texture.Unit[curr];
struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx);
const GLbitfield newenabled = state
? (texUnit->Enabled | texBit) : (texUnit->Enabled & ~texBit);

3
src/mesa/main/fbobject.c
View file

@ -44,6 +44,7 @@
#include "teximage.h"
#include "texobj.h"
#include "texstore.h"
#include "texstate.h"
/** Set this to 1 to help debug FBO incompleteness problems */
@ -1955,7 +1956,7 @@ _mesa_GenerateMipmapEXT(GLenum target)
return;
}
texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
texUnit = _mesa_get_current_tex_unit(ctx);
texObj = _mesa_select_tex_object(ctx, texUnit, target);
_mesa_lock_texture(ctx, texObj);