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

more texture cube work, misc code clean-up

Browse Source
This commit is contained in:
Brian Paul
2000-05-23 17:14:49 +00:00
parent fc4b44399a
commit 35d5301a54
6 changed files with 97 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/mesa/main/teximage.c
View File

@@ -385,34 +385,6 @@ set_teximage_component_sizes( struct gl_texture_image *texImage )
}
/*
* Given a texture unit and a texture target, return the corresponding
* texture object.
*/
static struct gl_texture_object *
select_tex_object(struct gl_texture_unit *unit, GLenum target)
{
switch (target) {
case GL_TEXTURE_1D:
return unit->CurrentD[1];
case GL_TEXTURE_2D:
return unit->CurrentD[2];
case GL_TEXTURE_3D:
return unit->CurrentD[3];
case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
return unit->CurrentCubeMap;
default:
gl_problem(NULL, "bad target in select_tex_object()");
return NULL;
}
}
static void
set_tex_image(struct gl_texture_object *tObj,
GLenum target, GLint level,
@@ -506,6 +478,45 @@ _mesa_free_texture_image( struct gl_texture_image *teximage )
/*
* Given a texture unit and a texture target, return the corresponding
* texture object.
*/
struct gl_texture_object *
_mesa_select_tex_object(GLcontext *ctx, struct gl_texture_unit *texUnit,
GLenum target)
{
switch (target) {
case GL_TEXTURE_1D:
return texUnit->CurrentD[1];
case GL_PROXY_TEXTURE_1D:
return ctx->Texture.Proxy1D;
case GL_TEXTURE_2D:
return texUnit->CurrentD[2];
case GL_PROXY_TEXTURE_2D:
return ctx->Texture.Proxy2D;
case GL_TEXTURE_3D:
return texUnit->CurrentD[3];
case GL_PROXY_TEXTURE_3D:
return ctx->Texture.Proxy3D;
case GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB:
case GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB:
case GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB:
case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB:
return ctx->Extensions.HaveTextureCubeMap
? texUnit->CurrentCubeMap : NULL;
case GL_PROXY_TEXTURE_CUBE_MAP_ARB:
return ctx->Extensions.HaveTextureCubeMap
? ctx->Texture.ProxyCubeMap : NULL;
default:
gl_problem(NULL, "bad target in _mesa_select_tex_object()");
return NULL;
}
}
/*
* Return the texture image struct which corresponds to target and level
* for the given texture unit.
@@ -1349,7 +1360,7 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
}
texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
texObj = select_tex_object(texUnit, target);
texObj = _mesa_select_tex_object(ctx, texUnit, target);
texImage = _mesa_select_tex_image(ctx, texUnit, target, level);
if (!texImage) {
@@ -1917,7 +1928,7 @@ _mesa_TexSubImage2D( GLenum target, GLint level,
}
texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit];
texObj = select_tex_object(texUnit, target);
texObj = _mesa_select_tex_object(ctx, texUnit, target);
texImage = texObj->Image[level];
assert(texImage);