Mesa (master): mesa/subroutines: drop the old subroutine index uploads.

Dave Airlie airlied at kemper.freedesktop.org
Tue Aug 23 01:04:15 UTC 2016


Module: Mesa
Branch: master
Commit: 0bce055d9ee11847bdf9adac5f216d8630a7824a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0bce055d9ee11847bdf9adac5f216d8630a7824a

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Jun  7 15:25:59 2016 +1000

mesa/subroutines: drop the old subroutine index uploads.

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>
Reviewed-by: Andres Gomez <agomez at igalia.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 733fee6..8b19c01 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_linked_shader *sh);
 /**
  * Return mask of GLSL_x flags by examining the MESA_GLSL env var.
  */
@@ -2574,7 +2573,6 @@ _mesa_GetActiveSubroutineName(GLuint program, GLenum shadertype,
                                    length, name, api_name);
 }
 
-
 GLvoid GLAPIENTRY
 _mesa_UniformSubroutinesuiv(GLenum shadertype, GLsizei count,
                             const GLuint *indices)
@@ -2656,8 +2654,6 @@ _mesa_UniformSubroutinesuiv(GLenum shadertype, GLsizei count,
    } while(i < count);
 
    FLUSH_VERTICES(ctx, _NEW_PROGRAM_CONSTANTS);
-
-   _mesa_shader_write_subroutine_index(ctx, sh);
 }
 
 
@@ -2868,8 +2864,6 @@ _mesa_shader_init_subroutine_defaults(struct gl_context *ctx,
 
       binding->IndexPtr[i] = find_compat_subroutine(sh, uni->type);
    }
-
-   _mesa_shader_write_subroutine_index(ctx, sh);
 }
 
 void




More information about the mesa-commit mailing list