diff options
| author | Timothy Arceri <[email protected]> | 2016-10-20 16:40:16 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-10-26 14:29:36 +1100 |
| commit | 4ac668616573b73a742a971bb0d7abe8234b6aa9 (patch) | |
| tree | 6d1eef8ebef262639cde4d227ec6833128ad0239 | |
| parent | 9972c591e7686658caaa1df46701137f98487811 (diff) | |
compiler: remove copy_shader_info()
This temporary helper is no longer needed now that we have finished
refactoring common shader metadata.
Reviewed-by: Jason Ekstrand <[email protected]>
| -rw-r--r-- | src/compiler/Makefile.sources | 4 | ||||
| -rw-r--r-- | src/compiler/shader_info.c | 32 | ||||
| -rw-r--r-- | src/mesa/main/shaderapi.c | 2 |
3 files changed, 1 insertions, 37 deletions
diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources index df1db0c3ec2..a30443da544 100644 --- a/src/compiler/Makefile.sources +++ b/src/compiler/Makefile.sources @@ -5,9 +5,7 @@ LIBCOMPILER_FILES = \ nir_types.cpp \ nir_types.h \ shader_enums.c \ - shader_enums.h \ - shader_info.c \ - shader_info.h + shader_enums.h # libglsl diff --git a/src/compiler/shader_info.c b/src/compiler/shader_info.c deleted file mode 100644 index 1171bbf6773..00000000000 --- a/src/compiler/shader_info.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright © 2016 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - * - */ - -#include "mesa/main/mtypes.h" - -void -copy_shader_info(const struct gl_shader_program *shader_prog, - struct gl_linked_shader *sh) -{ - shader_info *info = &sh->Program->info; -} diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 73b8931bda6..be3c203617d 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -2209,8 +2209,6 @@ _mesa_copy_linked_program_data(const struct gl_shader_program *src, default: break; } - - copy_shader_info(src, dst_sh); } /** |