fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-02 04:30:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: simplify translate_tex_src_bit()

Browse source
This commit is contained in:
Brian Paul 2009-09-01 15:51:23 -06:00
parent f337e2c495
commit b5ec0a6858
1 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/mesa/main/texenvprogram.c
View file

@ -241,27 +241,13 @@ static GLuint translate_mode( GLenum envMode, GLenum mode )
}
#define TEXTURE_UNKNOWN_INDEX 7
/**
* Translate TEXTURE_x_BIT to TEXTURE_x_INDEX.
*/
static GLuint translate_tex_src_bit( GLbitfield bit )
{
/* make sure number of switch cases is correct */
assert(NUM_TEXTURE_TARGETS == 7);
switch (bit) {
case TEXTURE_1D_BIT: return TEXTURE_1D_INDEX;
case TEXTURE_2D_BIT: return TEXTURE_2D_INDEX;
case TEXTURE_RECT_BIT: return TEXTURE_RECT_INDEX;
case TEXTURE_3D_BIT: return TEXTURE_3D_INDEX;
case TEXTURE_CUBE_BIT: return TEXTURE_CUBE_INDEX;
case TEXTURE_1D_ARRAY_BIT: return TEXTURE_1D_ARRAY_INDEX;
case TEXTURE_2D_ARRAY_BIT: return TEXTURE_2D_ARRAY_INDEX;
default:
assert(0);
return TEXTURE_UNKNOWN_INDEX;
}
ASSERT(bit);
return _mesa_ffs(bit) - 1;
}
@ -1230,7 +1216,7 @@ emit_texenv(struct texenv_fragment_program *p, GLuint unit)
static void load_texture( struct texenv_fragment_program *p, GLuint unit )
{
if (is_undef(p->src_texture[unit])) {
GLuint texTarget = p->state->unit[unit].source_index;
const GLuint texTarget = p->state->unit[unit].source_index;
struct ureg texcoord;
struct ureg tmp = get_tex_temp( p );
@ -1242,9 +1228,6 @@ static void load_texture( struct texenv_fragment_program *p, GLuint unit )
texcoord = p->texcoord_tex[unit];
}
if (texTarget == TEXTURE_UNKNOWN_INDEX)
program_error(p, "TexSrcBit");
/* TODO: Use D0_MASK_XY where possible.
*/
if (p->state->unit[unit].enabled) {