Attachment 20956 Details for Bug 18477 – Patch to fix assertion in slang linker

[patch] Patch to fix assertion in slang linker

slanglink.patch (text/plain), 1.89 KB, created by Brian Paul on 2008-12-09 07:57:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Paul

Created: 2008-12-09 07:57:27 UTC

Size: 1.89 KB

patch

obsolete

>diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
>index 08d7540..834f051 100644
>--- a/src/mesa/shader/slang/slang_link.c
>+++ b/src/mesa/shader/slang/slang_link.c
>@@ -207,7 +207,7 @@ link_varying_vars(struct gl_shader_program *shProg, struct gl_program *prog)
>  * This is basically a list/index of all uniforms found in either/both of
>  * the vertex and fragment shaders.
>  */
>-static void
>+static GLboolean
> link_uniform_vars(struct gl_shader_program *shProg,
>                   struct gl_program *prog,
>                   GLuint *numSamplers)
>@@ -239,7 +239,10 @@ link_uniform_vars(struct gl_shader_program *shProg,
>          /* Allocate a new sampler index */
>          GLuint sampNum = *numSamplers;
>          GLuint oldSampNum = (GLuint) prog->Parameters->ParameterValues[i][0];
>-         assert(oldSampNum < MAX_SAMPLERS);
>+         if (oldSampNum >= MAX_SAMPLERS) {
>+            link_error(shProg, "Too many texture samplers");
>+            return GL_FALSE;
>+         }
>          samplerMap[oldSampNum] = sampNum;
>          (*numSamplers)++;
>       }
>@@ -265,6 +268,7 @@ link_uniform_vars(struct gl_shader_program *shProg,
>       }
>    }
> 
>+   return GL_TRUE;
> }
> 
> 
>@@ -560,10 +564,18 @@ _slang_link(GLcontext *ctx,
>    }
> 
>    /* link uniform vars */
>-   if (shProg->VertexProgram)
>-      link_uniform_vars(shProg, &shProg->VertexProgram->Base, &numSamplers);
>-   if (shProg->FragmentProgram)
>-      link_uniform_vars(shProg, &shProg->FragmentProgram->Base, &numSamplers);
>+   if (shProg->VertexProgram) {
>+      if (!link_uniform_vars(shProg, &shProg->VertexProgram->Base,
>+                             &numSamplers)) {
>+         return;
>+      }
>+   }
>+   if (shProg->FragmentProgram) {
>+      if (!link_uniform_vars(shProg, &shProg->FragmentProgram->Base,
>+                             &numSamplers)) {
>+         return;
>+      }
>+   }
> 
>    /*_mesa_print_uniforms(shProg->Uniforms);*/
>

Actions: View | Splinter Review

Attachments on bug 18477: 20206 | 20207 | 20930 | 20956

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.