merge of glsl-compiler-1 branch

1 files changed, 0 insertions, 58 deletions

diff --git a/src/mesa/shader/slang/MachineIndependent/Initialize.h b/src/mesa/shader/slang/MachineIndependent/Initialize.h
deleted file mode 100755
index b273f06caea..00000000000
--- a/src/mesa/shader/slang/MachineIndependent/Initialize.h
+++ /dev/null
@@ -1,58 +0,0 @@
-//

-//Copyright (C) 2002-2005  3Dlabs Inc. Ltd.

-//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.

-//

-

-#ifndef _INITIALIZE_INCLUDED_

-#define _INITIALIZE_INCLUDED_

-

-#include "Include/ResourceLimits.h"

-#include "../Include/Common.h"

-#include "../Include/ShHandle.h"

-#include "SymbolTable.h"

-

-typedef TVector<TString> TBuiltInStrings;

-

-class TBuiltIns {

-public:

-    POOL_ALLOCATOR_NEW_DELETE(GlobalPoolAllocator)

-    void initialize();

-	void initialize(const TBuiltInResource& resources);

-    TBuiltInStrings* getBuiltInStrings() { return builtInStrings; }

-protected:

-    TBuiltInStrings builtInStrings[EShLangCount];

-};

-

-void IdentifyBuiltIns(EShLanguage, TSymbolTable&);

-void IdentifyBuiltIns(EShLanguage, TSymbolTable&, const TBuiltInResource &resources);

-

-#endif // _INITIALIZE_INCLUDED_