From 3ed850e91c4aa4b520c1b7dd9c7e1eecd926bce7 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 23 Jun 2010 12:18:21 -0700 Subject: [PATCH] linker: Update some comments, remove a couple FINISHMEs --- linker.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/linker.cpp b/linker.cpp index ebb1a81e7c9..abf5371ce90 100644 --- a/linker.cpp +++ b/linker.cpp @@ -814,7 +814,6 @@ link_shaders(struct glsl_program *prog) goto done; - /* FINISHME: Perform inter-stage linking. */ prog->_LinkedShaders = (struct glsl_shader **) calloc(2, sizeof(struct glsl_shader *)); prog->_NumLinkedShaders = 0; @@ -829,6 +828,10 @@ link_shaders(struct glsl_program *prog) prog->_NumLinkedShaders++; } + /* Here begins the inter-stage linking phase. Some initial validation is + * performed, then locations are assigned for uniforms, attributes, and + * varyings. + */ if (cross_validate_uniforms(prog)) { /* Validate the inputs of each stage with the output of the preceeding * stage. @@ -862,8 +865,6 @@ link_shaders(struct glsl_program *prog) /* FINISHME: Assign fragment shader output locations. */ - /* FINISHME: Generate code here. */ - done: free(vert_shader_list); } -- 2.30.2