X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Ftnl%2Ft_vb_texgen.c;h=7c1819b223cc7d6d9f100d1d507df8aff67fe153;hb=5606dfb572bf4b89b4882265924705bacc8c182b;hp=68ee089c095b25f7025d6d31f1dab9f2218d553c;hpb=ae7666385d6bb2885fce2590d4f07c6caa8b3260;p=mesa.git diff --git a/src/mesa/tnl/t_vb_texgen.c b/src/mesa/tnl/t_vb_texgen.c index 68ee089c095..7c1819b223c 100644 --- a/src/mesa/tnl/t_vb_texgen.c +++ b/src/mesa/tnl/t_vb_texgen.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.0 + * Version: 6.5 * - * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -35,12 +35,12 @@ * including any use thereof or modifications thereto. */ -#include "glheader.h" -#include "colormac.h" -#include "context.h" -#include "macros.h" -#include "imports.h" -#include "mtypes.h" +#include "main/glheader.h" +#include "main/colormac.h" +#include "main/context.h" +#include "main/macros.h" +#include "main/imports.h" +#include "main/mtypes.h" #include "math/m_xform.h" @@ -65,7 +65,6 @@ struct texgen_stage_data { /* Per-texunit derived state. */ GLuint TexgenSize[MAX_TEXTURE_COORD_UNITS]; - GLuint TexgenHoles[MAX_TEXTURE_COORD_UNITS]; texgen_func TexgenFunc[MAX_TEXTURE_COORD_UNITS]; /* Temporary values used in texgen. @@ -162,8 +161,8 @@ typedef void (*build_m_func)( GLfloat f[][3], static build_m_func build_m_tab[5] = { - 0, - 0, + NULL, + NULL, build_m2, build_m3, build_m3 @@ -239,14 +238,15 @@ typedef void (*build_f_func)( GLfloat *f, /* Just treat 4-vectors as 3-vectors. */ static build_f_func build_f_tab[5] = { - 0, - 0, + NULL, + NULL, build_f2, build_f3, build_f3 }; + /* Special case texgen functions. */ static void texgen_reflection_map_nv( GLcontext *ctx, @@ -254,27 +254,19 @@ static void texgen_reflection_map_nv( GLcontext *ctx, GLuint unit ) { struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; - GLvector4f *in = VB->TexCoordPtr[unit]; + GLvector4f *in = VB->AttribPtr[VERT_ATTRIB_TEX0 + unit]; GLvector4f *out = &store->texcoord[unit]; build_f_tab[VB->EyePtr->size]( out->start, out->stride, - VB->NormalPtr, + VB->AttribPtr[_TNL_ATTRIB_NORMAL], VB->EyePtr ); - if (in) { - out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_3; - out->count = in->count; - out->size = MAX2(in->size, 3); - if (in->size == 4) - _mesa_copy_tab[0x8]( out, in ); - } - else { - out->flags |= VEC_SIZE_3; - out->size = 3; - out->count = in->count; - } - + out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_3; + out->count = VB->Count; + out->size = MAX2(in->size, 3); + if (in->size == 4) + _mesa_copy_tab[0x8]( out, in ); } @@ -284,9 +276,9 @@ static void texgen_normal_map_nv( GLcontext *ctx, GLuint unit ) { struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; - GLvector4f *in = VB->TexCoordPtr[unit]; + GLvector4f *in = VB->AttribPtr[VERT_ATTRIB_TEX0 + unit]; GLvector4f *out = &store->texcoord[unit]; - GLvector4f *normal = VB->NormalPtr; + GLvector4f *normal = VB->AttribPtr[_TNL_ATTRIB_NORMAL]; GLfloat (*texcoord)[4] = (GLfloat (*)[4])out->start; GLuint count = VB->Count; GLuint i; @@ -299,18 +291,11 @@ static void texgen_normal_map_nv( GLcontext *ctx, } - if (in) { - out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_3; - out->count = in->count; - out->size = MAX2(in->size, 3); - if (in->size == 4) - _mesa_copy_tab[0x8]( out, in ); - } - else { - out->flags |= VEC_SIZE_3; - out->size = 3; - out->count = in->count; - } + out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_3; + out->count = count; + out->size = MAX2(in->size, 3); + if (in->size == 4) + _mesa_copy_tab[0x8]( out, in ); } @@ -319,7 +304,7 @@ static void texgen_sphere_map( GLcontext *ctx, GLuint unit ) { struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; - GLvector4f *in = VB->TexCoordPtr[unit]; + GLvector4f *in = VB->AttribPtr[VERT_ATTRIB_TEX0 + unit]; GLvector4f *out = &store->texcoord[unit]; GLfloat (*texcoord)[4] = (GLfloat (*)[4]) out->start; GLuint count = VB->Count; @@ -329,25 +314,20 @@ static void texgen_sphere_map( GLcontext *ctx, (build_m_tab[VB->EyePtr->size])( store->tmp_f, store->tmp_m, - VB->NormalPtr, + VB->AttribPtr[_TNL_ATTRIB_NORMAL], VB->EyePtr ); + out->size = MAX2(in->size,2); + for (i=0;isize = MAX2(in->size,2); - out->count = in->count; - out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_2; - if (in->size > 2) - _mesa_copy_tab[all_bits[in->size] & ~0x3]( out, in ); - } else { - out->size = 2; - out->flags |= VEC_SIZE_2; - out->count = in->count; - } + out->count = count; + out->flags |= (in->flags & VEC_SIZE_FLAGS) | VEC_SIZE_2; + if (in->size > 2) + _mesa_copy_tab[all_bits[in->size] & ~0x3]( out, in ); } @@ -358,17 +338,17 @@ static void texgen( GLcontext *ctx, { TNLcontext *tnl = TNL_CONTEXT(ctx); struct vertex_buffer *VB = &tnl->vb; - GLvector4f *in = VB->TexCoordPtr[unit]; + GLvector4f *in = VB->AttribPtr[VERT_ATTRIB_TEX0 + unit]; GLvector4f *out = &store->texcoord[unit]; const struct gl_texture_unit *texUnit = &ctx->Texture.Unit[unit]; const GLvector4f *obj = VB->ObjPtr; const GLvector4f *eye = VB->EyePtr; - const GLvector4f *normal = VB->NormalPtr; + const GLvector4f *normal = VB->AttribPtr[_TNL_ATTRIB_NORMAL]; const GLfloat *m = store->tmp_m; const GLuint count = VB->Count; GLfloat (*texcoord)[4] = (GLfloat (*)[4])out->data; GLfloat (*f)[3] = store->tmp_f; - GLuint holes = 0; + GLuint copy; if (texUnit->_GenFlags & TEXGEN_NEED_M) { build_m_tab[eye->size]( store->tmp_f, store->tmp_m, normal, eye ); @@ -376,47 +356,27 @@ static void texgen( GLcontext *ctx, build_f_tab[eye->size]( (GLfloat *)store->tmp_f, 3, normal, eye ); } - if (!in) { - ASSERT(0); - in = out; - in->count = VB->Count; - out->size = store->TexgenSize[unit]; - out->flags |= texUnit->TexGenEnabled; - out->count = VB->Count; - holes = store->TexgenHoles[unit]; - } - else { - GLuint copy = (all_bits[in->size] & ~texUnit->TexGenEnabled); - if (copy) - _mesa_copy_tab[copy]( out, in ); - - out->size = MAX2(in->size, store->TexgenSize[unit]); - out->flags |= (in->flags & VEC_SIZE_FLAGS) | texUnit->TexGenEnabled; - out->count = in->count; - - holes = ~all_bits[in->size] & store->TexgenHoles[unit]; - } + out->size = MAX2(in->size, store->TexgenSize[unit]); + out->flags |= (in->flags & VEC_SIZE_FLAGS) | texUnit->TexGenEnabled; + out->count = count; - if (holes) { - if (holes & VEC_DIRTY_3) _mesa_vector4f_clean_elem(out, count, 3); - if (holes & VEC_DIRTY_2) _mesa_vector4f_clean_elem(out, count, 2); - if (holes & VEC_DIRTY_1) _mesa_vector4f_clean_elem(out, count, 1); - if (holes & VEC_DIRTY_0) _mesa_vector4f_clean_elem(out, count, 0); - } + copy = (all_bits[in->size] & ~texUnit->TexGenEnabled); + if (copy) + _mesa_copy_tab[copy]( out, in ); if (texUnit->TexGenEnabled & S_BIT) { GLuint i; - switch (texUnit->GenModeS) { + switch (texUnit->GenS.Mode) { case GL_OBJECT_LINEAR: _mesa_dotprod_tab[obj->size]( (GLfloat *)out->data, sizeof(out->data[0]), obj, - texUnit->ObjectPlaneS ); + texUnit->GenS.ObjectPlane ); break; case GL_EYE_LINEAR: _mesa_dotprod_tab[eye->size]( (GLfloat *)out->data, sizeof(out->data[0]), eye, - texUnit->EyePlaneS ); + texUnit->GenS.EyePlane ); break; case GL_SPHERE_MAP: for (i = 0; i < count; i++) @@ -440,16 +400,16 @@ static void texgen( GLcontext *ctx, if (texUnit->TexGenEnabled & T_BIT) { GLuint i; - switch (texUnit->GenModeT) { + switch (texUnit->GenT.Mode) { case GL_OBJECT_LINEAR: _mesa_dotprod_tab[obj->size]( &(out->data[0][1]), sizeof(out->data[0]), obj, - texUnit->ObjectPlaneT ); + texUnit->GenT.ObjectPlane ); break; case GL_EYE_LINEAR: _mesa_dotprod_tab[eye->size]( &(out->data[0][1]), sizeof(out->data[0]), eye, - texUnit->EyePlaneT ); + texUnit->GenT.EyePlane ); break; case GL_SPHERE_MAP: for (i = 0; i < count; i++) @@ -473,16 +433,16 @@ static void texgen( GLcontext *ctx, if (texUnit->TexGenEnabled & R_BIT) { GLuint i; - switch (texUnit->GenModeR) { + switch (texUnit->GenR.Mode) { case GL_OBJECT_LINEAR: _mesa_dotprod_tab[obj->size]( &(out->data[0][2]), sizeof(out->data[0]), obj, - texUnit->ObjectPlaneR ); + texUnit->GenR.ObjectPlane ); break; case GL_EYE_LINEAR: _mesa_dotprod_tab[eye->size]( &(out->data[0][2]), sizeof(out->data[0]), eye, - texUnit->EyePlaneR ); + texUnit->GenR.EyePlane ); break; case GL_REFLECTION_MAP_NV: for (i=0;iTexGenEnabled & Q_BIT) { - switch (texUnit->GenModeQ) { + switch (texUnit->GenQ.Mode) { case GL_OBJECT_LINEAR: _mesa_dotprod_tab[obj->size]( &(out->data[0][3]), sizeof(out->data[0]), obj, - texUnit->ObjectPlaneQ ); + texUnit->GenQ.ObjectPlane ); break; case GL_EYE_LINEAR: _mesa_dotprod_tab[eye->size]( &(out->data[0][3]), sizeof(out->data[0]), eye, - texUnit->EyePlaneQ ); + texUnit->GenQ.EyePlane ); break; default: _mesa_problem(ctx, "Bad Q texgen"); @@ -520,34 +480,42 @@ static void texgen( GLcontext *ctx, + static GLboolean run_texgen_stage( GLcontext *ctx, struct tnl_pipeline_stage *stage ) { struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; - struct texgen_stage_data *store = TEXGEN_STAGE_DATA( stage ); + struct texgen_stage_data *store = TEXGEN_STAGE_DATA(stage); GLuint i; - for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) - if (ctx->Texture._TexGenEnabled & ENABLE_TEXGEN(i)) { - if (stage->changed_inputs & (_TNL_BIT_POS | _TNL_BIT_NORMAL | _TNL_BIT_TEX(i))) - store->TexgenFunc[i]( ctx, store, i ); + if (!ctx->Texture._TexGenEnabled || ctx->VertexProgram._Current) + return GL_TRUE; + + for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) { + struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i]; - VB->AttribPtr[VERT_ATTRIB_TEX0+i] = - VB->TexCoordPtr[i] = &store->texcoord[i]; + if (texUnit->TexGenEnabled) { + + store->TexgenFunc[i]( ctx, store, i ); + + VB->TexCoordPtr[i] = + VB->AttribPtr[VERT_ATTRIB_TEX0 + i] = &store->texcoord[i]; } + } return GL_TRUE; } - - -static GLboolean run_validate_texgen_stage( GLcontext *ctx, - struct tnl_pipeline_stage *stage ) +static void validate_texgen_stage( GLcontext *ctx, + struct tnl_pipeline_stage *stage ) { struct texgen_stage_data *store = TEXGEN_STAGE_DATA(stage); GLuint i; + if (!ctx->Texture._TexGenEnabled || ctx->VertexProgram._Current) + return; + for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) { struct gl_texture_unit *texUnit = &ctx->Texture.Unit[i]; @@ -564,7 +532,6 @@ static GLboolean run_validate_texgen_stage( GLcontext *ctx, sz = 1; store->TexgenSize[i] = sz; - store->TexgenHoles[i] = (all_bits[sz] & ~texUnit->TexGenEnabled); store->TexgenFunc[i] = texgen; /* general solution */ /* look for special texgen cases */ @@ -582,48 +549,9 @@ static GLboolean run_validate_texgen_stage( GLcontext *ctx, } } } - - stage->run = run_texgen_stage; - return stage->run( ctx, stage ); } -static void check_texgen( GLcontext *ctx, struct tnl_pipeline_stage *stage ) -{ - GLuint i; - stage->active = 0; - - if (ctx->Texture._TexGenEnabled && !ctx->VertexProgram.Enabled) { - GLuint inputs = 0; - GLuint outputs = 0; - - if (ctx->Texture._GenFlags & (TEXGEN_OBJ_LINEAR | TEXGEN_NEED_EYE_COORD)) - inputs |= _TNL_BIT_POS; - - if (ctx->Texture._GenFlags & TEXGEN_NEED_NORMALS) - inputs |= _TNL_BIT_NORMAL; - - for (i = 0 ; i < ctx->Const.MaxTextureCoordUnits ; i++) - if (ctx->Texture._TexGenEnabled & ENABLE_TEXGEN(i)) - { - outputs |= _TNL_BIT_TEX(i); - - /* Need the original input in case it contains a Q coord: - * (sigh) - */ - inputs |= _TNL_BIT_TEX(i); - - /* Something for Feedback? */ - } - - if (stage->privatePtr) - stage->run = run_validate_texgen_stage; - stage->active = 1; - stage->inputs = inputs; - stage->outputs = outputs; - } -} - @@ -647,10 +575,7 @@ static GLboolean alloc_texgen_data( GLcontext *ctx, store->tmp_f = (GLfloat (*)[3]) MALLOC(VB->Size * sizeof(GLfloat) * 3); store->tmp_m = (GLfloat *) MALLOC(VB->Size * sizeof(GLfloat)); - /* Now validate and run the stage. - */ - stage->run = run_validate_texgen_stage; - return stage->run( ctx, stage ); + return GL_TRUE; } @@ -678,14 +603,9 @@ static void free_texgen_data( struct tnl_pipeline_stage *stage ) const struct tnl_pipeline_stage _tnl_texgen_stage = { "texgen", /* name */ - _NEW_TEXTURE, /* when to call check() */ - _NEW_TEXTURE, /* when to invalidate stored data */ - GL_FALSE, /* active? */ - 0, /* inputs */ - 0, /* outputs */ - 0, /* changed_inputs */ NULL, /* private data */ + alloc_texgen_data, /* destructor */ free_texgen_data, /* destructor */ - check_texgen, /* check */ - alloc_texgen_data /* run -- initially set to alloc data */ + validate_texgen_stage, /* check */ + run_texgen_stage /* run -- initially set to alloc data */ };