[Mesa-dev] [PATCH 5/5] mesa/subroutines: drop the old subroutine index uploads.

Dave Airlie airlied at gmail.com
Tue Jun 7 05:25:59 UTC 2016


From: Dave Airlie <airlied at redhat.com>

We used to upload the indices when they changed, now we rely
on the drivers calling the correct hook to have the values
updated from the context storage.

Signed-off-by: Dave Airlie <airlied at redhat.com>
---
 src/mesa/main/shaderapi.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 07c581f..e6ca7ed 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -65,7 +65,6 @@
 #define PATH_MAX _MAX_PATH
 #endif
 
-static void _mesa_shader_write_subroutine_index(struct gl_context *ctx, struct gl_shader *sh);
 /**
  * Return mask of GLSL_x flags by examining the MESA_GLSL env var.
  */
@@ -2554,7 +2553,6 @@ _mesa_GetActiveSubroutineName(GLuint program, GLenum shadertype,
                                    length, name, api_name);
 }
 
-
 GLvoid GLAPIENTRY
 _mesa_UniformSubroutinesuiv(GLenum shadertype, GLsizei count,
                             const GLuint *indices)
@@ -2636,8 +2634,6 @@ _mesa_UniformSubroutinesuiv(GLenum shadertype, GLsizei count,
    } while(i < count);
 
    FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);
-
-   _mesa_shader_write_subroutine_index(ctx, sh);
 }
 
 
@@ -2844,8 +2840,6 @@ _mesa_shader_init_subroutine_defaults(struct gl_context *ctx,
          continue;
       ctx->SubroutineIndex[sh->Stage].IndexPtr[i] = find_compat_subroutine(sh, uni->type);
    }
-
-   _mesa_shader_write_subroutine_index(ctx, sh);
 }
 
 void
-- 
2.5.5



More information about the mesa-dev mailing list