diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-15 21:35:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-15 21:35:41 +0000 |
| commit | 5e633abcca598289d0423d89bb400b41e6417259 (patch) | |
| tree | 74258f0d1f9f5f2b171d16fd9654a13803216c6f /mesalib/src/mesa/program/ir_to_mesa.cpp | |
| parent | b5d1fd89898edb34f73679b542c754d837d44cf8 (diff) | |
| download | vcxsrv-5e633abcca598289d0423d89bb400b41e6417259.tar.gz vcxsrv-5e633abcca598289d0423d89bb400b41e6417259.tar.bz2 vcxsrv-5e633abcca598289d0423d89bb400b41e6417259.zip | |
xserver libX11 libxcb mesa git update 15 Mar 2011
Diffstat (limited to 'mesalib/src/mesa/program/ir_to_mesa.cpp')
| -rw-r--r-- | mesalib/src/mesa/program/ir_to_mesa.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp index a7bafb50b..f88ef7a37 100644 --- a/mesalib/src/mesa/program/ir_to_mesa.cpp +++ b/mesalib/src/mesa/program/ir_to_mesa.cpp @@ -2453,8 +2453,7 @@ check_resources(const struct gl_context *ctx, ctx->Const.MaxVertexTextureImageUnits) {
fail_link(shader_program, "Too many vertex shader texture samplers");
}
- if (prog->Parameters->NumParameters >
- ctx->Const.VertexProgram.MaxUniformComponents / 4) {
+ if (prog->Parameters->NumParameters > MAX_UNIFORMS) {
fail_link(shader_program, "Too many vertex shader constants");
}
break;
@@ -2464,7 +2463,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.MaxUniformComponents / 4) {
+ MAX_GEOMETRY_UNIFORM_COMPONENTS / 4) {
fail_link(shader_program, "Too many geometry shader constants");
}
break;
@@ -2473,8 +2472,7 @@ check_resources(const struct gl_context *ctx, ctx->Const.MaxTextureImageUnits) {
fail_link(shader_program, "Too many fragment shader texture samplers");
}
- if (prog->Parameters->NumParameters >
- ctx->Const.FragmentProgram.MaxUniformComponents / 4) {
+ if (prog->Parameters->NumParameters > MAX_UNIFORMS) {
fail_link(shader_program, "Too many fragment shader constants");
}
break;
|