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

glsl: check number of varying variables against the limit

Browse source 
Link fails if too many varying vars.

(cherry picked from master, commit cc58fbcf2c)
This commit is contained in:
Brian Paul 2009-06-26 16:53:46 -06:00
parent 4181a107cb
commit 21320b24c5
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/mesa/shader/slang/slang_link.c
View file

@ -97,7 +97,8 @@ bits_agree(GLbitfield flags1, GLbitfield flags2, GLbitfield bit)
* which inputs are centroid-sampled, invariant, etc.
*/
static GLboolean
link_varying_vars(struct gl_shader_program *shProg, struct gl_program *prog)
link_varying_vars(GLcontext *ctx,
struct gl_shader_program *shProg, struct gl_program *prog)
{
GLuint *map, i, firstVarying, newFile;
GLbitfield *inOutFlags;
@ -156,8 +157,12 @@ link_varying_vars(struct gl_shader_program *shProg, struct gl_program *prog)
var->Flags);
}
if (shProg->Varying->NumParameters > ctx->Const.MaxVarying) {
link_error(shProg, "Too many varying variables");
return GL_FALSE;
}
/* Map varying[i] to varying[j].
* Plus, set prog->Input/OutputFlags[] as described above.
* Note: the loop here takes care of arrays or large (sz>4) vars.
*/
{
@ -725,11 +730,11 @@ _slang_link(GLcontext *ctx,
/* link varying vars */
if (shProg->VertexProgram) {
if (!link_varying_vars(shProg, &shProg->VertexProgram->Base))
if (!link_varying_vars(ctx, shProg, &shProg->VertexProgram->Base))
return;
}
if (shProg->FragmentProgram) {
if (!link_varying_vars(shProg, &shProg->FragmentProgram->Base))
if (!link_varying_vars(ctx, shProg, &shProg->FragmentProgram->Base))
return;
}