mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-04-25 11:20:49 +02:00
Remove some ghost code and adjust things a bit.
This commit is contained in:
parent
e4894177ba
commit
26b1c97a9d
1 changed files with 2 additions and 11 deletions
|
|
@ -1489,22 +1489,12 @@ void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx )
|
|||
GLuint hash;
|
||||
struct vertex_program *prev = ctx->VertexProgram._Current;
|
||||
|
||||
if (ctx->VertexProgram._Enabled) {
|
||||
if (ctx->VertexProgram._Enabled == GL_FALSE) {
|
||||
/* Grab all the relevent state and put it in a single structure:
|
||||
*/
|
||||
key = make_state_key(ctx);
|
||||
hash = hash_key(key);
|
||||
|
||||
if (tnl->vp_cache == NULL) {
|
||||
tnl->vp_cache = MALLOC(sizeof(*tnl->vp_cache));
|
||||
tnl->vp_cache->size = 5;
|
||||
tnl->vp_cache->n_items = 0;
|
||||
tnl->vp_cache->items = MALLOC(tnl->vp_cache->size *
|
||||
sizeof(*tnl->vp_cache->items));
|
||||
_mesa_memset(tnl->vp_cache->items, 0, tnl->vp_cache->size *
|
||||
sizeof(*tnl->vp_cache->items));
|
||||
}
|
||||
|
||||
/* Look for an already-prepared program for this state:
|
||||
*/
|
||||
ctx->_TnlProgram = (struct vertex_program *)
|
||||
|
|
@ -1530,6 +1520,7 @@ void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx )
|
|||
if (0)
|
||||
_mesa_printf("Found existing TNL program for key %x\n", hash);
|
||||
}
|
||||
ctx->VertexProgram._Current = ctx->_TnlProgram;
|
||||
}
|
||||
else {
|
||||
ctx->VertexProgram._Current = ctx->VertexProgram.Current;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue