X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fpipelineobj.c;h=5fc2808a0c85a8d5bc6c79b78a450882a6802f2b;hb=9f93afb9a5586cb90e127ba7d63de3b416d08821;hp=82298409ee19db4cc01add3a54b556c524d57556;hpb=4566aaaa5b169724174e04dc0a99a37ae0abcd2a;p=mesa.git

diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c
index 82298409ee1..5fc2808a0c8 100644
--- a/src/mesa/main/pipelineobj.c
+++ b/src/mesa/main/pipelineobj.c
@@ -297,7 +297,7 @@ _mesa_UseProgramStages(GLuint pipeline, GLbitfield stages, GLuint program)
        *     shader stages in the pipeline program pipeline object are not
        *     modified."
        */
-      if (!shProg->LinkStatus) {
+      if (!shProg->data->LinkStatus) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
                      "glUseProgramStages(program not linked)");
          return;
@@ -376,7 +376,7 @@ _mesa_ActiveShaderProgram(GLuint pipeline, GLuint program)
     */
    pipe->EverBound = GL_TRUE;
 
-   if ((shProg != NULL) && !shProg->LinkStatus) {
+   if ((shProg != NULL) && !shProg->data->LinkStatus) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
             "glActiveShaderProgram(program %u not linked)", shProg->Name);
       return;
@@ -645,7 +645,8 @@ _mesa_GetProgramPipelineiv(GLuint pipeline, GLenum pname, GLint *params)
       *params = pipe->ActiveProgram ? pipe->ActiveProgram->Name : 0;
       return;
    case GL_INFO_LOG_LENGTH:
-      *params = pipe->InfoLog ? strlen(pipe->InfoLog) + 1 : 0;
+      *params = (pipe->InfoLog && pipe->InfoLog[0] != '\0') ?
+         strlen(pipe->InfoLog) + 1 : 0;
       return;
    case GL_VALIDATE_STATUS:
       *params = pipe->Validated;
@@ -729,30 +730,33 @@ program_stages_all_active(struct gl_pipeline_object *pipe,
 static bool
 program_stages_interleaved_illegally(const struct gl_pipeline_object *pipe)
 {
-   struct gl_shader_program *prev = NULL;
-   unsigned i, j;
+   unsigned prev_linked_stages = 0;
 
    /* Look for programs bound to stages: A -> B -> A, with any intervening
     * sequence of unrelated programs or empty stages.
     */
-   for (i = 0; i < MESA_SHADER_STAGES; i++) {
+   for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {
       struct gl_shader_program *cur = pipe->CurrentProgram[i];
 
-      /* Empty stages anywhere in the pipe are OK */
-      if (!cur || cur == prev)
+      /* Empty stages anywhere in the pipe are OK.  Also we can be confident
+       * that if the linked_stages mask matches we are looking at the same
+       * linked program because a previous validation call to
+       * program_stages_all_active() will have already failed if two different
+       * programs with the sames stages linked are not active for all linked
+       * stages.
+       */
+      if (!cur || cur->data->linked_stages == prev_linked_stages)
          continue;
 
-      if (prev) {
+      if (prev_linked_stages) {
          /* We've seen an A -> B transition; look at the rest of the pipe
           * to see if we ever see A again.
           */
-         for (j = i + 1; j < MESA_SHADER_STAGES; j++) {
-            if (pipe->CurrentProgram[j] == prev)
-               return true;
-         }
+         if (prev_linked_stages >> (i + 1))
+            return true;
       }
 
-      prev = cur;
+      prev_linked_stages = cur->data->linked_stages;
    }
 
    return false;