diff options
| author | Michal Krol <[email protected]> | 2006-02-13 11:23:36 +0000 |
|---|---|---|
| committer | Michal Krol <[email protected]> | 2006-02-13 11:23:36 +0000 |
| commit | a2ea606377ed5679dc513eabcf2d398216b47d61 (patch) | |
| tree | bd50c1ae07d521b8b1aada83973f81faa291f697 /src/mesa/tnl/t_vb_texmat.c | |
| parent | 2363fff347a064b9584ecb8e26d80d421cafbbbd (diff) | |
Add ARB_vertex_shader stage just before render stage.
If enabled, all other stages, except render, are disabled.
Diffstat (limited to 'src/mesa/tnl/t_vb_texmat.c')
| -rw-r--r-- | src/mesa/tnl/t_vb_texmat.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/mesa/tnl/t_vb_texmat.c b/src/mesa/tnl/t_vb_texmat.c index 23475303853..701f27bd8a5 100644 --- a/src/mesa/tnl/t_vb_texmat.c +++ b/src/mesa/tnl/t_vb_texmat.c @@ -1,8 +1,8 @@ /* * Mesa 3-D graphics library - * Version: 6.1 + * 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"), @@ -61,6 +61,9 @@ static GLboolean run_texmat_stage( GLcontext *ctx, struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; GLuint i; + if (ctx->ShaderObjects.CurrentProgram != NULL) + return GL_TRUE; + if (!ctx->Texture._TexMatEnabled || ctx->VertexProgram._Enabled) return GL_TRUE; |