fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: test against MaxUniformComponents in check_resources()

Browse source 
Since we're compiling/linking GLSL shaders we should check against
the shader uniform limits, not the legacy vertex/fragment program
parameter limits which are usually lower.
This commit is contained in:
Brian Paul 2011-03-11 10:03:40 -07:00
parent e0e94026a0
commit d7db14ab7d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/program/ir_to_mesa.cpp
View file

@ -2454,7 +2454,7 @@ check_resources(const struct gl_context *ctx,
fail_link(shader_program, "Too many vertex shader texture samplers");
}
if (prog->Parameters->NumParameters >
ctx->Const.VertexProgram.MaxParameters) {
ctx->Const.VertexProgram.MaxUniformComponents / 4) {
fail_link(shader_program, "Too many vertex shader constants");
}
break;
@ -2464,7 +2464,7 @@ check_resources(const struct gl_context *ctx,
fail_link(shader_program, "Too many geometry shader texture samplers");
}
if (prog->Parameters->NumParameters >
ctx->Const.GeometryProgram.MaxParameters) {
ctx->Const.GeometryProgram.MaxUniformComponents / 4) {
fail_link(shader_program, "Too many geometry shader constants");
}
break;
@ -2474,7 +2474,7 @@ check_resources(const struct gl_context *ctx,
fail_link(shader_program, "Too many fragment shader texture samplers");
}
if (prog->Parameters->NumParameters >
ctx->Const.FragmentProgram.MaxParameters) {
ctx->Const.FragmentProgram.MaxUniformComponents / 4) {
fail_link(shader_program, "Too many fragment shader constants");
}
break;