Mesa (master): glsl: Rename link_fs_input_layout_qualifiers to "inout".

Kenneth Graunke kwg at kemper.freedesktop.org
Sat Aug 20 20:52:49 UTC 2016


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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Tue Jun 28 10:00:18 2016 -0700

glsl: Rename link_fs_input_layout_qualifiers to "inout".

We're going to handle output qualifiers here too, and calling it "inout"
seems to be the going convention.

Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>

---

 src/compiler/glsl/linker.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index 51d7643..a1a65ef 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -1871,7 +1871,7 @@ link_tes_in_layout_qualifiers(struct gl_shader_program *prog,
  * and propagates them to the linked FS and linked shader program.
  */
 static void
-link_fs_input_layout_qualifiers(struct gl_shader_program *prog,
+link_fs_inout_layout_qualifiers(struct gl_shader_program *prog,
 	                        struct gl_linked_shader *linked_shader,
 	                        struct gl_shader **shader_list,
 	                        unsigned num_shaders)
@@ -2217,7 +2217,7 @@ link_intrastage_shaders(void *mem_ctx,
    linked->ir = new(linked) exec_list;
    clone_ir_list(mem_ctx, linked->ir, main->ir);
 
-   link_fs_input_layout_qualifiers(prog, linked, shader_list, num_shaders);
+   link_fs_inout_layout_qualifiers(prog, linked, shader_list, num_shaders);
    link_tcs_out_layout_qualifiers(prog, linked, shader_list, num_shaders);
    link_tes_in_layout_qualifiers(prog, linked, shader_list, num_shaders);
    link_gs_inout_layout_qualifiers(prog, linked, shader_list, num_shaders);




More information about the mesa-commit mailing list