Fix the Code::Blocks builds.

src/OpenGL/libGLES_CM/libGLES_CM.cbp

@@ -247,6 +247,8 @@
 		<Unit filename="../../Shader/VertexRoutine.hpp" />
 		<Unit filename="../../Shader/VertexShader.cpp" />
 		<Unit filename="../../Shader/VertexShader.hpp" />
+		<Unit filename="../common/NameSpace.cpp" />
+		<Unit filename="../common/NameSpace.hpp" />
 		<Unit filename="../common/Object.cpp" />
 		<Unit filename="../common/Object.hpp" />
 		<Unit filename="../common/debug.cpp" />
@@ -257,7 +259,6 @@
 		<Unit filename="../include/GLES2/gl2.h" />
 		<Unit filename="../include/GLES2/gl2ext.h" />
 		<Unit filename="../include/GLES2/gl2platform.h" />
-		<Unit filename="../include/GLSLANG/ShaderLang.h" />
 		<Unit filename="../include/KHR/khrplatform.h" />
 		<Unit filename="Buffer.cpp" />
 		<Unit filename="Buffer.h" />
@@ -267,8 +268,6 @@
 		<Unit filename="Device.hpp" />
 		<Unit filename="Framebuffer.cpp" />
 		<Unit filename="Framebuffer.h" />
-		<Unit filename="HandleAllocator.cpp" />
-		<Unit filename="HandleAllocator.h" />
 		<Unit filename="Image.cpp" />
 		<Unit filename="Image.hpp" />
 		<Unit filename="IndexDataManager.cpp" />

src/OpenGL/libGLESv2/libGLESv2.cbp

@@ -247,6 +247,8 @@
 		<Unit filename="../../Shader/VertexRoutine.hpp" />
 		<Unit filename="../../Shader/VertexShader.cpp" />
 		<Unit filename="../../Shader/VertexShader.hpp" />
+		<Unit filename="../common/NameSpace.cpp" />
+		<Unit filename="../common/NameSpace.hpp" />
 		<Unit filename="../common/Object.cpp" />
 		<Unit filename="../common/Object.hpp" />
 		<Unit filename="../common/debug.cpp" />
@@ -256,6 +258,7 @@
 		<Unit filename="../compiler/BaseTypes.h" />
 		<Unit filename="../compiler/Common.h" />
 		<Unit filename="../compiler/Compiler.cpp" />
+		<Unit filename="../compiler/Compiler.h" />
 		<Unit filename="../compiler/ConstantUnion.h" />
 		<Unit filename="../compiler/Diagnostics.cpp" />
 		<Unit filename="../compiler/Diagnostics.h" />
@@ -266,8 +269,6 @@
 		<Unit filename="../compiler/InfoSink.h" />
 		<Unit filename="../compiler/Initialize.cpp" />
 		<Unit filename="../compiler/Initialize.h" />
-		<Unit filename="../compiler/InitializeDll.cpp" />
-		<Unit filename="../compiler/InitializeDll.h" />
 		<Unit filename="../compiler/InitializeGlobals.h" />
 		<Unit filename="../compiler/InitializeParseContext.cpp" />
 		<Unit filename="../compiler/InitializeParseContext.h" />
@@ -281,8 +282,6 @@
 		<Unit filename="../compiler/PoolAlloc.cpp" />
 		<Unit filename="../compiler/PoolAlloc.h" />
 		<Unit filename="../compiler/Pragma.h" />
-		<Unit filename="../compiler/ShHandle.h" />
-		<Unit filename="../compiler/ShaderLang.cpp" />
 		<Unit filename="../compiler/SymbolTable.cpp" />
 		<Unit filename="../compiler/SymbolTable.h" />
 		<Unit filename="../compiler/TranslatorASM.cpp" />
@@ -336,7 +335,6 @@
 		<Unit filename="../include/GLES2/gl2.h" />
 		<Unit filename="../include/GLES2/gl2ext.h" />
 		<Unit filename="../include/GLES2/gl2platform.h" />
-		<Unit filename="../include/GLSLANG/ShaderLang.h" />
 		<Unit filename="../include/KHR/khrplatform.h" />
 		<Unit filename="Buffer.cpp" />
 		<Unit filename="Buffer.h" />
@@ -348,8 +346,6 @@
 		<Unit filename="Fence.h" />
 		<Unit filename="Framebuffer.cpp" />
 		<Unit filename="Framebuffer.h" />
-		<Unit filename="HandleAllocator.cpp" />
-		<Unit filename="HandleAllocator.h" />
 		<Unit filename="Image.cpp" />
 		<Unit filename="Image.hpp" />
 		<Unit filename="IndexDataManager.cpp" />

src/Radiance/include/GLSLANG/ShaderLang.h

-//
-// Copyright (c) 2002-2013 The ANGLE Project Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-#ifndef _COMPILER_INTERFACE_INCLUDED_
-#define _COMPILER_INTERFACE_INCLUDED_
-
-//
-// This is the platform independent interface between an OGL driver
-// and the shading language compiler.
-//
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// Version number for shader translation API.
-// It is incremented everytime the API changes.
-#define SH_VERSION 105
-
-//
-// The names of the following enums have been derived by replacing GL prefix
-// with SH. For example, SH_INFO_LOG_LENGTH is equivalent to GL_INFO_LOG_LENGTH.
-// The enum values are also equal to the values of their GL counterpart. This
-// is done to make it easier for applications to use the shader library.
-//
-typedef enum {
-  SH_FRAGMENT_SHADER = 0x8B30,
-  SH_VERTEX_SHADER   = 0x8B31
-} ShShaderType;
-
-typedef enum {
-  SH_GLES2_SPEC = 0x8B40,
-  SH_WEBGL_SPEC = 0x8B41
-} ShShaderSpec;
-
-typedef enum {
-  SH_INFO_LOG_LENGTH             =  0x8B84,
-  SH_OBJECT_CODE_LENGTH          =  0x8B88,  // GL_SHADER_SOURCE_LENGTH
-  SH_ACTIVE_UNIFORM_MAX_LENGTH   =  0x8B87,
-  SH_ACTIVE_ATTRIBUTE_MAX_LENGTH =  0x8B8A
-} ShShaderInfo;
-
-// Compile options.
-typedef enum {
-  SH_VALIDATE                = 0,
-  SH_VALIDATE_LOOP_INDEXING  = 0x0001,
-  SH_INTERMEDIATE_TREE       = 0x0002,
-  SH_OBJECT_CODE             = 0x0004,
-  SH_ATTRIBUTES_UNIFORMS     = 0x0008,
-  SH_LINE_DIRECTIVES         = 0x0010,
-  SH_SOURCE_PATH             = 0x0020
-} ShCompileOptions;
-
-//
-// Driver must call this first, once, before doing any other
-// compiler operations.
-// If the function succeeds, the return value is nonzero, else zero.
-//
-int ShInitialize();
-//
-// Driver should call this at shutdown.
-// If the function succeeds, the return value is nonzero, else zero.
-//
-int ShFinalize();
-
-//
-// Implementation dependent built-in resources (constants and extensions).
-// The names for these resources has been obtained by stripping gl_/GL_.
-//
-typedef struct
-{
-    // Constants.
-    int MaxVertexAttribs;
-    int MaxVertexUniformVectors;
-    int MaxVaryingVectors;
-    int MaxVertexTextureImageUnits;
-    int MaxCombinedTextureImageUnits;
-    int MaxTextureImageUnits;
-    int MaxFragmentUniformVectors;
-    int MaxDrawBuffers;
-
-    // Extensions.
-    // Set to 1 to enable the extension, else 0.
-    int OES_standard_derivatives;
-	int OES_fragment_precision_high;
-    int OES_EGL_image_external;
-
-    unsigned int MaxCallStackDepth;
-} ShBuiltInResources;
-
-//
-// Initialize built-in resources with minimum expected values.
-//
-void ShInitBuiltInResources(ShBuiltInResources* resources);
-
-//
-// ShHandle held by but opaque to the driver.  It is allocated,
-// managed, and de-allocated by the compiler. It's contents 
-// are defined by and used by the compiler.
-//
-// If handle creation fails, 0 will be returned.
-//
-typedef void* ShHandle;
-
-//
-// Driver calls these to create and destroy compiler objects.
-//
-// Returns the handle of constructed compiler.
-// Parameters:
-// type: Specifies the type of shader - SH_FRAGMENT_SHADER or SH_VERTEX_SHADER.
-// spec: Specifies the language spec the compiler must conform to -
-//       SH_GLES2_SPEC or SH_WEBGL_SPEC.
-// resources: Specifies the built-in resources.
-ShHandle ShConstructCompiler(ShShaderType type, ShShaderSpec spec,
-                             const ShBuiltInResources* resources);
-void ShDestruct(ShHandle handle);
-
-//
-// Compiles the given shader source.
-// If the function succeeds, the return value is nonzero, else zero.
-// Parameters:
-// handle: Specifies the handle of compiler to be used.
-// shaderStrings: Specifies an array of pointers to null-terminated strings
-//                containing the shader source code.
-// numStrings: Specifies the number of elements in shaderStrings array.
-// compileOptions: A mask containing the following parameters:
-// SH_VALIDATE: Validates shader to ensure that it conforms to the spec
-//              specified during compiler construction.
-// SH_VALIDATE_LOOP_INDEXING: Validates loop and indexing in the shader to
-//                            ensure that they do not exceed the minimum
-//                            functionality mandated in GLSL 1.0 spec,
-//                            Appendix A, Section 4 and 5.
-//                            There is no need to specify this parameter when
-//                            compiling for WebGL - it is implied.
-// SH_INTERMEDIATE_TREE: Writes intermediate tree to info log.
-//                       Can be queried by calling ShGetInfoLog().
-// SH_OBJECT_CODE: Translates intermediate tree to glsl or hlsl shader.
-//                 Can be queried by calling ShGetObjectCode().
-// SH_ATTRIBUTES_UNIFORMS: Extracts attributes and uniforms.
-//                         Can be queried by calling ShGetActiveAttrib() and
-//                         ShGetActiveUniform().
-//
-int ShCompile(
-    const ShHandle handle,
-    const char* const shaderStrings[],
-    const int numStrings,
-    int compileOptions
-    );
-
-// Returns a parameter from a compiled shader.
-// Parameters:
-// handle: Specifies the compiler
-// pname: Specifies the parameter to query.
-// The following parameters are defined:
-// SH_INFO_LOG_LENGTH: the number of characters in the information log
-//                     including the null termination character.
-// SH_OBJECT_CODE_LENGTH: the number of characters in the object code
-//                        including the null termination character.
-// SH_ACTIVE_ATTRIBUTES: the number of active attribute variables.
-// SH_ACTIVE_ATTRIBUTE_MAX_LENGTH: the length of the longest active attribute
-//                                 variable name including the null
-//                                 termination character.
-// SH_ACTIVE_UNIFORMS: the number of active uniform variables.
-// SH_ACTIVE_UNIFORM_MAX_LENGTH: the length of the longest active uniform
-//                               variable name including the null
-//                               termination character.
-// SH_MAPPED_NAME_MAX_LENGTH: the length of the mapped variable name including
-//                            the null termination character.
-// 
-// params: Requested parameter
-void ShGetInfo(const ShHandle handle, ShShaderInfo pname, int* params);
-
-// Returns nul-terminated information log for a compiled shader.
-// Parameters:
-// handle: Specifies the compiler
-// infoLog: Specifies an array of characters that is used to return
-//          the information log. It is assumed that infoLog has enough memory
-//          to accomodate the information log. The size of the buffer required
-//          to store the returned information log can be obtained by calling
-//          ShGetInfo with SH_INFO_LOG_LENGTH.
-void ShGetInfoLog(const ShHandle handle, char* infoLog);
-
-// Returns null-terminated object code for a compiled shader.
-// Parameters:
-// handle: Specifies the compiler
-// infoLog: Specifies an array of characters that is used to return
-//          the object code. It is assumed that infoLog has enough memory to
-//          accomodate the object code. The size of the buffer required to
-//          store the returned object code can be obtained by calling
-//          ShGetInfo with SH_OBJECT_CODE_LENGTH.
-void ShGetObjectCode(const ShHandle handle, char* objCode);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // _COMPILER_INTERFACE_INCLUDED_

src/Radiance/libRAD/libRAD.cbp

@@ -161,6 +161,7 @@
 		<Unit filename="../../OpenGL/compiler/BaseTypes.h" />
 		<Unit filename="../../OpenGL/compiler/Common.h" />
 		<Unit filename="../../OpenGL/compiler/Compiler.cpp" />
+		<Unit filename="../../OpenGL/compiler/Compiler.h" />
 		<Unit filename="../../OpenGL/compiler/ConstantUnion.h" />
 		<Unit filename="../../OpenGL/compiler/Diagnostics.cpp" />
 		<Unit filename="../../OpenGL/compiler/Diagnostics.h" />
@@ -171,8 +172,6 @@
 		<Unit filename="../../OpenGL/compiler/InfoSink.h" />
 		<Unit filename="../../OpenGL/compiler/Initialize.cpp" />
 		<Unit filename="../../OpenGL/compiler/Initialize.h" />
-		<Unit filename="../../OpenGL/compiler/InitializeDll.cpp" />
-		<Unit filename="../../OpenGL/compiler/InitializeDll.h" />
 		<Unit filename="../../OpenGL/compiler/InitializeGlobals.h" />
 		<Unit filename="../../OpenGL/compiler/InitializeParseContext.cpp" />
 		<Unit filename="../../OpenGL/compiler/InitializeParseContext.h" />
@@ -186,8 +185,6 @@
 		<Unit filename="../../OpenGL/compiler/PoolAlloc.cpp" />
 		<Unit filename="../../OpenGL/compiler/PoolAlloc.h" />
 		<Unit filename="../../OpenGL/compiler/Pragma.h" />
-		<Unit filename="../../OpenGL/compiler/ShHandle.h" />
-		<Unit filename="../../OpenGL/compiler/ShaderLang.cpp" />
 		<Unit filename="../../OpenGL/compiler/SymbolTable.cpp" />
 		<Unit filename="../../OpenGL/compiler/SymbolTable.h" />
 		<Unit filename="../../OpenGL/compiler/TranslatorASM.cpp" />
@@ -317,7 +314,6 @@
 		<Unit filename="../include/GLES2/gl2.h" />
 		<Unit filename="../include/GLES2/gl2ext.h" />
 		<Unit filename="../include/GLES2/gl2platform.h" />
-		<Unit filename="../include/GLSLANG/ShaderLang.h" />
 		<Unit filename="../include/KHR/khrplatform.h" />
 		<Unit filename="../include/RAD/rad.h" />
 		<Unit filename="Config.cpp" />