From fccfb5a90e3fae5422d91f03df591900877bbbb5 Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Sun, 28 Sep 2014 18:43:52 +0000 Subject: [PATCH] Remove unneeded skeletal work. git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@28345 e7fa87d3-cd2b-0410-9028-fcbf551c1848 --- BIL/BilDisassemble.cpp | 43 -------------------------- BIL/BilDisassemble.h | 50 ------------------------------ BIL/BilDoc.cpp | 65 --------------------------------------- BIL/BilDoc.h | 50 ------------------------------ BIL/CMakeLists.txt | 8 ++--- BIL/GlslangToBil.cpp | 1 - StandAlone/StandAlone.cpp | 12 +------- 7 files changed, 3 insertions(+), 226 deletions(-) delete mode 100644 BIL/BilDisassemble.cpp delete mode 100644 BIL/BilDisassemble.h delete mode 100644 BIL/BilDoc.cpp delete mode 100644 BIL/BilDoc.h diff --git a/BIL/BilDisassemble.cpp b/BIL/BilDisassemble.cpp deleted file mode 100644 index 25bbd005..00000000 --- a/BIL/BilDisassemble.cpp +++ /dev/null @@ -1,43 +0,0 @@ -// -//Copyright (C) 2014 LunarG, Inc. -// -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without -//modification, are permitted provided that the following conditions -//are met: -// -// Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// -// Neither the name of 3Dlabs Inc. Ltd. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -//POSSIBILITY OF SUCH DAMAGE. - -#include "BilDisassemble.h" - -namespace glbil { - -void Disassemble(std::ostream& out, const std::vector&) -{ -} - -}; // end glbil namespace diff --git a/BIL/BilDisassemble.h b/BIL/BilDisassemble.h deleted file mode 100644 index eab6eb9a..00000000 --- a/BIL/BilDisassemble.h +++ /dev/null @@ -1,50 +0,0 @@ -// -//Copyright (C) 2014 LunarG, Inc. -// -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without -//modification, are permitted provided that the following conditions -//are met: -// -// Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// -// Neither the name of 3Dlabs Inc. Ltd. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -//POSSIBILITY OF SUCH DAMAGE. - -#pragma once -#ifndef BilDisassembler_H -#define BilDisassembler_H - -#include "Bil.h" - -#include -#include - -namespace glbil { - - void Disassemble(std::ostream& out, const std::vector&); - -}; // end glbil namespace - -#endif // BilDisassembler_H diff --git a/BIL/BilDoc.cpp b/BIL/BilDoc.cpp deleted file mode 100644 index caa37f82..00000000 --- a/BIL/BilDoc.cpp +++ /dev/null @@ -1,65 +0,0 @@ -// -//Copyright (C) 2014 LunarG, Inc. -// -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without -//modification, are permitted provided that the following conditions -//are met: -// -// Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// -// Neither the name of 3Dlabs Inc. Ltd. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -//POSSIBILITY OF SUCH DAMAGE. - -// -// Author: John Kessenich, LunarG -// - -// -// Create BIL documentation. -// - -#include "BilDoc.h" - -namespace glbil { - -#if ! defined(INCLUDE_BIL_DOC) - -void Parameterize() -{ -} - -void PrintDoc() -{ -} - -#else - -void PrintDoc() -{ -} - -#endif - -}; // end glbil namespace diff --git a/BIL/BilDoc.h b/BIL/BilDoc.h deleted file mode 100644 index 6d87a897..00000000 --- a/BIL/BilDoc.h +++ /dev/null @@ -1,50 +0,0 @@ -// -//Copyright (C) 2014 LunarG, Inc. -// -//All rights reserved. -// -//Redistribution and use in source and binary forms, with or without -//modification, are permitted provided that the following conditions -//are met: -// -// Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// -// Neither the name of 3Dlabs Inc. Ltd. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -//"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -//LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -//FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -//COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -//BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -//LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -//CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -//LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -//ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -//POSSIBILITY OF SUCH DAMAGE. - -// -// Author: John Kessenich, LunarG -// - -// -// Create BIL documentation. -// - -//#define INCLUDE_BIL_DOC - -namespace glbil { - - void Parameterize(); - void PrintDoc(); - -}; // end glbil namespace diff --git a/BIL/CMakeLists.txt b/BIL/CMakeLists.txt index 8f01ddf2..16959924 100644 --- a/BIL/CMakeLists.txt +++ b/BIL/CMakeLists.txt @@ -4,17 +4,13 @@ include_directories(.. ${CMAKE_CURRENT_BINARY_DIR}) set(SOURCES GlslangToBil.cpp - BilBuilder.cpp - BilDisassemble.cpp - BilDoc.cpp) + BilBuilder.cpp) set(HEADERS Bil.h GlslangToBil.h BilBuilder.h - Bir.h - BilDisassemble.h - BilDoc.h) + Bir.h) add_library(BIL STATIC ${SOURCES} ${HEADERS}) diff --git a/BIL/GlslangToBil.cpp b/BIL/GlslangToBil.cpp index 043d9d37..89ab8ed4 100644 --- a/BIL/GlslangToBil.cpp +++ b/BIL/GlslangToBil.cpp @@ -35,7 +35,6 @@ #include "Bil.h" #include "GlslangToBil.h" #include "BilBuilder.h" -#include "BilDisassemble.h" // Glslang includes #include "glslang/MachineIndependent/localintermediate.h" diff --git a/StandAlone/StandAlone.cpp b/StandAlone/StandAlone.cpp index 55e557cc..b500a50b 100644 --- a/StandAlone/StandAlone.cpp +++ b/StandAlone/StandAlone.cpp @@ -41,8 +41,6 @@ #include "./../glslang/Include/ShHandle.h" #include "./../glslang/Public/ShaderLang.h" #include "../BIL/GlslangToBil.h" -#include "../BIL/BilDisassemble.h" -#include "../BIL/BilDoc.h" #include "../BIL/GLSL450Lib.h" #include #include @@ -500,11 +498,6 @@ bool ProcessArguments(int argc, char* argv[]) case 'm': Options |= EOptionMemoryLeakMode; break; - case 'p': - glbil::Parameterize(); - glbil::PrintDoc(); - exit(0); - break; case 'q': Options |= EOptionDumpReflection; break; @@ -645,7 +638,6 @@ void CompileAndLinkShaders() if (CompileFailed || LinkFailed) printf("Bil is not generated for failed compile or link\n"); else { - glbil::Parameterize(); for (int stage = 0; stage < EShLangCount; ++stage) { if (program.getIntermediate((EShLanguage)stage)) { std::vector bil; @@ -660,7 +652,6 @@ void CompileAndLinkShaders() case EShLangCompute: name = "comp"; break; default: name = "unknown"; break; } - glbil::Disassemble(std::cout, bil); glslang::OutputBil(bil, name); } } @@ -863,13 +854,12 @@ void usage() "\n" "To get other information, use one of the following options:\n" "(Each option must be specified separately, but can go anywhere in the command line.)\n" - " -b create BIL in file .bil and print out disassembly\n" + " -b create BIL in file .bil\n" " -c configuration dump; use to create default configuration file (redirect to a .conf file)\n" " -d default to desktop (#version 110) when there is no version in the shader (default is ES version 100)\n" " -i intermediate tree (glslang AST) is printed out\n" " -l link validation of all input files\n" " -m memory leak mode\n" - " -p print BIL documentation\n" " -q dump reflection query database\n" " -r relaxed semantic error-checking mode\n" " -s silent mode\n"