OSDN Git Service

Rename libGLESv2 references to libRAD. Rename the es2 namespace to rad.
authorNicolas Capens <capn@google.com>
Mon, 3 Nov 2014 19:27:01 +0000 (14:27 -0500)
committerNicolas Capens <nicolascapens@google.com>
Mon, 3 Nov 2014 19:53:27 +0000 (19:53 +0000)
BUG=18218488

Change-Id: Iaf64c9a42328c54f763db53a0830e3ceb45cb09c
Reviewed-on: https://swiftshader-review.googlesource.com/1323
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
57 files changed:
src/Radiance/compiler/Compiler.vcxproj
src/Radiance/compiler/OutputASM.cpp
src/Radiance/compiler/OutputASM.h
src/Radiance/compiler/TranslatorASM.cpp
src/Radiance/compiler/TranslatorASM.h
src/Radiance/compiler/preprocessor/preprocessor.vcxproj
src/Radiance/libEGL/Display.cpp
src/Radiance/libEGL/Surface.cpp
src/Radiance/libEGL/libEGL.cpp
src/Radiance/libEGL/libEGL.vcxproj
src/Radiance/libEGL/main.cpp
src/Radiance/libEGL/main.h
src/Radiance/libRAD/Buffer.cpp
src/Radiance/libRAD/Buffer.h
src/Radiance/libRAD/Context.cpp
src/Radiance/libRAD/Context.h
src/Radiance/libRAD/Device.cpp
src/Radiance/libRAD/Device.hpp
src/Radiance/libRAD/Fence.cpp
src/Radiance/libRAD/Fence.h
src/Radiance/libRAD/Framebuffer.cpp
src/Radiance/libRAD/Framebuffer.h
src/Radiance/libRAD/HandleAllocator.cpp
src/Radiance/libRAD/HandleAllocator.h
src/Radiance/libRAD/Image.cpp
src/Radiance/libRAD/Image.hpp
src/Radiance/libRAD/IndexDataManager.cpp
src/Radiance/libRAD/IndexDataManager.h
src/Radiance/libRAD/Program.cpp
src/Radiance/libRAD/Program.h
src/Radiance/libRAD/Query.cpp
src/Radiance/libRAD/Query.h
src/Radiance/libRAD/RefCountObject.cpp
src/Radiance/libRAD/RefCountObject.h
src/Radiance/libRAD/Renderbuffer.cpp
src/Radiance/libRAD/Renderbuffer.h
src/Radiance/libRAD/ResourceManager.cpp
src/Radiance/libRAD/ResourceManager.h
src/Radiance/libRAD/Shader.cpp
src/Radiance/libRAD/Shader.h
src/Radiance/libRAD/Texture.cpp
src/Radiance/libRAD/Texture.h
src/Radiance/libRAD/VertexDataManager.cpp
src/Radiance/libRAD/VertexDataManager.h
src/Radiance/libRAD/libRAD.cbp [moved from src/Radiance/libRAD/libGLESv2.cbp with 83% similarity]
src/Radiance/libRAD/libRAD.cpp [moved from src/Radiance/libRAD/libGLESv2.cpp with 86% similarity]
src/Radiance/libRAD/libRAD.def [moved from src/Radiance/libRAD/libGLESv2.def with 97% similarity]
src/Radiance/libRAD/libRAD.rc [moved from src/Radiance/libRAD/libGLESv2.rc with 96% similarity]
src/Radiance/libRAD/libRAD.vcxproj [moved from src/Radiance/libRAD/libGLESv2.vcxproj with 92% similarity]
src/Radiance/libRAD/libRAD.vcxproj.filters [moved from src/Radiance/libRAD/libGLESv2.vcxproj.filters with 93% similarity]
src/Radiance/libRAD/main.cpp
src/Radiance/libRAD/main.h
src/Radiance/libRAD/mathutil.h
src/Radiance/libRAD/resource.h
src/Radiance/libRAD/utilities.cpp
src/Radiance/libRAD/utilities.h
src/SwiftShader.sln

index 3416a22..83e4454 100644 (file)
@@ -15,7 +15,7 @@
     </ProjectConfiguration>\r
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}</ProjectGuid>\r
+    <ProjectGuid>{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}</ProjectGuid>\r
     <RootNamespace>compiler</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
     <ProjectName>Compiler</ProjectName>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="preprocessor\preprocessor.vcxproj">\r
-      <Project>{92940255-ab4b-42fb-a2c4-0fab19c3c48a}</Project>\r
-      <Private>true</Private>\r
+      <Project>{6303975e-7060-4ce7-8090-cb2de0b840b4}</Project>\r
+      <Private>false</Private>\r
       <ReferenceOutputAssembly>true</ReferenceOutputAssembly>\r
       <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>\r
       <LinkLibraryDependencies>true</LinkLibraryDependencies>\r
index 2ffc576..57af4a3 100644 (file)
@@ -14,7 +14,7 @@
 #include "common/debug.h"\r
 #include "compiler/InfoSink.h"\r
 \r
-#include "libGLESv2/Shader.h"\r
+#include "libRAD/Shader.h"\r
 \r
 #define GL_APICALL\r
 #include <GLES2/gl2.h>\r
@@ -99,7 +99,7 @@ namespace sh
                this->registerIndex = registerIndex;\r
        }\r
 \r
-       OutputASM::OutputASM(TParseContext &context, es2::Shader *shaderObject) : TIntermTraverser(true, true, true), mContext(context), shaderObject(shaderObject)\r
+       OutputASM::OutputASM(TParseContext &context, rad::Shader *shaderObject) : TIntermTraverser(true, true, true), mContext(context), shaderObject(shaderObject)\r
        {\r
                shader = 0;\r
                pixelShader = 0;\r
@@ -2003,10 +2003,10 @@ namespace sh
                {\r
                        const TType &type = varying->getType();\r
                        const char *name = varying->getAsSymbolNode()->getSymbol().c_str();\r
-                       es2::VaryingList &activeVaryings = shaderObject->varyings;\r
+                       rad::VaryingList &activeVaryings = shaderObject->varyings;\r
                        \r
                        // Check if this varying has been declared before without having a register assigned\r
-                       for(es2::VaryingList::iterator v = activeVaryings.begin(); v != activeVaryings.end(); v++)\r
+                       for(rad::VaryingList::iterator v = activeVaryings.begin(); v != activeVaryings.end(); v++)\r
                        {\r
                                if(v->name == name)\r
                                {\r
@@ -2020,7 +2020,7 @@ namespace sh
                                }\r
                        }\r
                        \r
-                       activeVaryings.push_back(es2::Varying(glVariableType(type), name, varying->getArraySize(), reg, 0));\r
+                       activeVaryings.push_back(rad::Varying(glVariableType(type), name, varying->getArraySize(), reg, 0));\r
                }\r
        }\r
 \r
index ae6cfa7..a40fc36 100644 (file)
@@ -24,7 +24,7 @@
 #include <set>\r
 #include <map>\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
        class Shader;\r
 }\r
@@ -81,7 +81,7 @@ namespace sh
        class OutputASM : public TIntermTraverser\r
        {\r
        public:\r
-               explicit OutputASM(TParseContext &context, es2::Shader *shaderObject);\r
+               explicit OutputASM(TParseContext &context, rad::Shader *shaderObject);\r
                ~OutputASM();\r
 \r
                void output();\r
@@ -144,7 +144,7 @@ namespace sh
                static int dim2(TIntermNode *m);\r
                static unsigned int loopCount(TIntermLoop *node);\r
 \r
-               es2::Shader *const shaderObject;\r
+               rad::Shader *const shaderObject;\r
                sw::Shader *shader;\r
                sw::PixelShader *pixelShader;\r
                sw::VertexShader *vertexShader;\r
index 8749900..b518a6c 100644 (file)
@@ -13,7 +13,7 @@
 \r
 #include "InitializeParseContext.h"\r
 \r
-TranslatorASM::TranslatorASM(es2::Shader *shaderObject, ShShaderType type, ShShaderSpec spec) : TCompiler(type, spec), shaderObject(shaderObject)\r
+TranslatorASM::TranslatorASM(rad::Shader *shaderObject, ShShaderType type, ShShaderSpec spec) : TCompiler(type, spec), shaderObject(shaderObject)\r
 {\r
 }\r
 \r
index 596c424..12807cc 100644 (file)
@@ -17,7 +17,7 @@
 #include "Shader/PixelShader.hpp"\r
 #include "Shader/VertexShader.hpp"\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
        class Shader;\r
 }\r
@@ -25,13 +25,13 @@ namespace es2
 class TranslatorASM : public TCompiler\r
 {\r
 public:\r
-    TranslatorASM(es2::Shader *shaderObject, ShShaderType type, ShShaderSpec spec);\r
+    TranslatorASM(rad::Shader *shaderObject, ShShaderType type, ShShaderSpec spec);\r
 \r
 protected:\r
     virtual bool translate(TIntermNode* root);\r
 \r
 private:\r
-       es2::Shader *const shaderObject;\r
+       rad::Shader *const shaderObject;\r
 };\r
 \r
 #endif  // COMPILER_TRANSLATORASM_H_\r
index 2a61489..a7cf8c2 100644 (file)
@@ -11,7 +11,7 @@
     </ProjectConfiguration>\r
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}</ProjectGuid>\r
+    <ProjectGuid>{6303975E-7060-4CE7-8090-CB2DE0B840B4}</ProjectGuid>\r
     <RootNamespace>preprocessor</RootNamespace>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
index 3cabebe..bff3741 100644 (file)
@@ -388,18 +388,11 @@ EGLContext Display::createContext(EGLConfig configHandle, const egl::Context *sh
     const egl::Config *config = mConfigSet.get(configHandle);\r
        egl::Context *context = 0;\r
 \r
-       if(clientVersion == 1 && config->mRenderableType & EGL_OPENGL_ES_BIT)\r
+       if(clientVersion == 2 && config->mRenderableType & EGL_OPENGL_ES2_BIT)\r
        {\r
-               if(es1::createContext != 0)\r
+               if(rad::createContext != 0)\r
                {\r
-                       context = es1::createContext(config, shareContext);\r
-               }\r
-       }\r
-       else if(clientVersion == 2 && config->mRenderableType & EGL_OPENGL_ES2_BIT)\r
-       {\r
-               if(es2::createContext != 0)\r
-               {\r
-                       context = es2::createContext(config, shareContext);\r
+                       context = rad::createContext(config, shareContext);\r
                }\r
        }\r
        else\r
index 16e6ef4..5703dfe 100644 (file)
@@ -132,7 +132,7 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight)
 \r
     if(mWindow)\r
     {\r
-               frameBuffer = es::createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight);\r
+               frameBuffer = rad::createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight);\r
 \r
                if(!frameBuffer)\r
                {\r
@@ -142,7 +142,7 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight)
                }\r
     }\r
 \r
-       backBuffer = es::createBackBuffer(backBufferWidth, backBufferHeight, mConfig);\r
+       backBuffer = rad::createBackBuffer(backBufferWidth, backBufferHeight, mConfig);\r
 \r
     if(!backBuffer)\r
     {\r
@@ -153,7 +153,7 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight)
 \r
     if(mConfig->mDepthStencilFormat != sw::FORMAT_NULL)\r
     {\r
-        mDepthStencil = es::createDepthStencil(backBufferWidth, backBufferHeight, mConfig->mDepthStencilFormat, 1, false);\r
+        mDepthStencil = rad::createDepthStencil(backBufferWidth, backBufferHeight, mConfig->mDepthStencilFormat, 1, false);\r
 \r
                if(!mDepthStencil)\r
                {\r
index 5d1eda2..a998637 100644 (file)
@@ -1207,15 +1207,9 @@ __eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const cha
             }\r
         }\r
 \r
-               if(es2::getProcAddress != 0)\r
+               if(rad::getProcAddress != 0)\r
                {\r
-                       __eglMustCastToProperFunctionPointerType proc = es2::getProcAddress(procname);\r
-                       if(proc) return proc;\r
-               }\r
-\r
-               if(es1::getProcAddress != 0)\r
-               {\r
-                       __eglMustCastToProperFunctionPointerType proc =  es1::getProcAddress(procname);\r
+                       __eglMustCastToProperFunctionPointerType proc = rad::getProcAddress(procname);\r
                        if(proc) return proc;\r
                }\r
     }\r
index 51242f5..3e57389 100644 (file)
@@ -15,7 +15,7 @@
     </ProjectConfiguration>\r
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}</ProjectGuid>\r
+    <ProjectGuid>{2F6770B5-F168-4FCD-8A56-4DD95BEC8893}</ProjectGuid>\r
     <RootNamespace>libEGL</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
   </PropertyGroup>\r
index aad1ab3..496a3bd 100644 (file)
@@ -84,37 +84,19 @@ CONSTRUCTOR static bool eglAttachProcess()
        eglAttachThread();\r
 \r
        #if defined(_WIN32)\r
-       const char *libGLES_CM_lib = "libGLES_CM.dll";\r
+       const char *libRAD_lib = "libRAD.dll";\r
        #else\r
-       const char *libGLES_CM_lib = "libGLES_CM.so.1";\r
+       const char *libRAD_lib = "libRAD.so";\r
        #endif\r
        \r
-    libGLES_CM = loadLibrary(libGLES_CM_lib);\r
-    es1::createContext = (egl::Context *(*)(const egl::Config*, const egl::Context*))getProcAddress(libGLES_CM, "glCreateContext");\r
-    es1::getProcAddress = (__eglMustCastToProperFunctionPointerType (*)(const char*))getProcAddress(libGLES_CM, "glGetProcAddress");\r
-\r
-       #if defined(_WIN32)\r
-       const char *libGLESv2_lib = "libGLESv2.dll";\r
-       #else\r
-       const char *libGLESv2_lib = "libGLESv2.so.2";\r
-       #endif\r
-       \r
-    libGLESv2 = loadLibrary(libGLESv2_lib);\r
-    es2::createContext = (egl::Context *(*)(const egl::Config*, const egl::Context*))getProcAddress(libGLESv2, "glCreateContext");\r
-    es2::getProcAddress = (__eglMustCastToProperFunctionPointerType (*)(const char*))getProcAddress(libGLESv2, "glGetProcAddress");\r
-\r
-       es::createBackBuffer = (egl::Image *(*)(int, int, const egl::Config*))getProcAddress(libGLES_CM, "createBackBuffer");\r
-       es::createDepthStencil = (egl::Image *(*)(unsigned int, unsigned int, sw::Format, int, bool))getProcAddress(libGLES_CM, "createDepthStencil");\r
-    es::createFrameBuffer = (sw::FrameBuffer *(*)(EGLNativeDisplayType, EGLNativeWindowType, int, int))getProcAddress(libGLES_CM, "createFrameBuffer");\r
-\r
-       if(!es::createBackBuffer)\r
-       {\r
-               es::createBackBuffer = (egl::Image *(*)(int, int, const egl::Config*))getProcAddress(libGLESv2, "createBackBuffer");\r
-               es::createDepthStencil = (egl::Image *(*)(unsigned int, unsigned int, sw::Format, int, bool))getProcAddress(libGLESv2, "createDepthStencil");\r
-               es::createFrameBuffer = (sw::FrameBuffer *(*)(EGLNativeDisplayType, EGLNativeWindowType, int, int))getProcAddress(libGLESv2, "createFrameBuffer");\r
-       }\r
-\r
-       return libGLES_CM != 0 || libGLESv2 != 0;\r
+    libRAD = loadLibrary(libRAD_lib);\r
+    rad::createContext = (egl::Context *(*)(const egl::Config*, const egl::Context*))getProcAddress(libRAD, "glCreateContext");\r
+    rad::getProcAddress = (__eglMustCastToProperFunctionPointerType (*)(const char*))getProcAddress(libRAD, "glGetProcAddress");\r
+       rad::createBackBuffer = (egl::Image *(*)(int, int, const egl::Config*))getProcAddress(libRAD, "createBackBuffer");\r
+       rad::createDepthStencil = (egl::Image *(*)(unsigned int, unsigned int, sw::Format, int, bool))getProcAddress(libRAD, "createDepthStencil");\r
+    rad::createFrameBuffer = (sw::FrameBuffer *(*)(EGLNativeDisplayType, EGLNativeWindowType, int, int))getProcAddress(libRAD, "createFrameBuffer");\r
+\r
+       return libRAD != 0;\r
 }\r
 \r
 DESTRUCTOR static void eglDetachProcess()\r
@@ -123,7 +105,7 @@ DESTRUCTOR static void eglDetachProcess()
 \r
        eglDetachThread();\r
        sw::Thread::freeLocalStorageKey(currentTLS);\r
-       freeLibrary(libGLESv2);\r
+       freeLibrary(libRAD);\r
 }\r
 \r
 #if defined(_WIN32)\r
@@ -318,24 +300,14 @@ void error(EGLint errorCode)
        }\r
 }\r
 \r
-namespace es1\r
-{\r
-       egl::Context *(*createContext)(const egl::Config *config, const egl::Context *shareContext) = 0;\r
-       __eglMustCastToProperFunctionPointerType (*getProcAddress)(const char *procname) = 0;\r
-}\r
-\r
-namespace es2\r
+namespace rad\r
 {\r
        egl::Context *(*createContext)(const egl::Config *config, const egl::Context *shareContext) = 0;\r
        __eglMustCastToProperFunctionPointerType (*getProcAddress)(const char *procname) = 0;\r
-}\r
 \r
-namespace es\r
-{\r
        egl::Image *(*createBackBuffer)(int width, int height, const egl::Config *config) = 0;\r
        egl::Image *(*createDepthStencil)(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard) = 0;\r
        sw::FrameBuffer *(*createFrameBuffer)(EGLNativeDisplayType display, EGLNativeWindowType window, int width, int height) = 0;\r
 }\r
 \r
-void *libGLES_CM = 0;   // Handle to the libGLES_CM module\r
-void *libGLESv2 = 0;   // Handle to the libGLESv2 module\r
+void *libRAD = 0;   // Handle to the libRAD module\r
index fbdc014..0c50a50 100644 (file)
@@ -82,28 +82,17 @@ namespace sw
        enum Format : unsigned char;
 }
 
-// libGLES_CM dependencies
-namespace es1
+// libRAD dependencies
+namespace rad
 {
        extern egl::Context *(*createContext)(const egl::Config *config, const egl::Context *shareContext);
        extern __eglMustCastToProperFunctionPointerType (*getProcAddress)(const char *procname);
-}
 
-// libGLESv2 dependencies
-namespace es2
-{
-       extern egl::Context *(*createContext)(const egl::Config *config, const egl::Context *shareContext);
-       extern __eglMustCastToProperFunctionPointerType (*getProcAddress)(const char *procname);
-}
-
-namespace es
-{
        extern egl::Image *(*createBackBuffer)(int width, int height, const egl::Config *config);
        extern egl::Image *(*createDepthStencil)(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard);
        extern sw::FrameBuffer *(*createFrameBuffer)(EGLNativeDisplayType display, EGLNativeWindowType window, int width, int height);
 }
 
-extern void *libGLES_CM;   // Handle to the libGLES_CM module
-extern void *libGLESv2;    // Handle to the libGLESv2 module
+extern void *libRAD;    // Handle to the libRAD module
 
 #endif  // LIBEGL_MAIN_H_
index 78411ac..476b153 100644 (file)
@@ -19,7 +19,7 @@
 #include "VertexDataManager.h"
 #include "IndexDataManager.h"
 
-namespace es2
+namespace rad
 {
 
 Buffer::Buffer(GLuint id) : RefCountObject(id)
index 1c4b4b0..44e4169 100644 (file)
@@ -25,7 +25,7 @@
 #include <cstddef>\r
 #include <vector>\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 class Buffer : public RefCountObject\r
 {\r
index 55dfd06..6d6a1b2 100644 (file)
@@ -9,7 +9,7 @@
 // or implied, including but not limited to any patent rights, are granted to you.\r
 //\r
 \r
-// Context.cpp: Implements the es2::Context class, managing all GL state and performing\r
+// Context.cpp: Implements the rad::Context class, managing all GL state and performing\r
 // rendering operations. It is the GLES2 specific implementation of EGLContext.\r
 \r
 #include "Context.h"\r
@@ -37,7 +37,7 @@
 #undef near\r
 #undef far\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 Device *Context::device = 0;\r
 \r
@@ -1734,7 +1734,7 @@ void Context::applyState(GLenum drawMode)
 \r
     if(mState.cullFace)\r
     {\r
-        device->setCullMode(es2sw::ConvertCullMode(mState.cullMode, mState.frontFace));\r
+        device->setCullMode(rad2sw::ConvertCullMode(mState.cullMode, mState.frontFace));\r
     }\r
     else\r
     {\r
@@ -1746,7 +1746,7 @@ void Context::applyState(GLenum drawMode)
         if(mState.depthTest)\r
         {\r
                        device->setDepthBufferEnable(true);\r
-                       device->setDepthCompare(es2sw::ConvertDepthComparison(mState.depthFunc));\r
+                       device->setDepthCompare(rad2sw::ConvertDepthComparison(mState.depthFunc));\r
         }\r
         else\r
         {\r
@@ -1763,15 +1763,15 @@ void Context::applyState(GLenum drawMode)
                        device->setAlphaBlendEnable(true);\r
                        device->setSeparateAlphaBlendEnable(true);\r
 \r
-            device->setBlendConstant(es2sw::ConvertColor(mState.blendColor));\r
+            device->setBlendConstant(rad2sw::ConvertColor(mState.blendColor));\r
 \r
-                       device->setSourceBlendFactor(es2sw::ConvertBlendFunc(mState.sourceBlendRGB));\r
-                       device->setDestBlendFactor(es2sw::ConvertBlendFunc(mState.destBlendRGB));\r
-                       device->setBlendOperation(es2sw::ConvertBlendOp(mState.blendEquationRGB));\r
+                       device->setSourceBlendFactor(rad2sw::ConvertBlendFunc(mState.sourceBlendRGB));\r
+                       device->setDestBlendFactor(rad2sw::ConvertBlendFunc(mState.destBlendRGB));\r
+                       device->setBlendOperation(rad2sw::ConvertBlendOp(mState.blendEquationRGB));\r
 \r
-            device->setSourceBlendFactorAlpha(es2sw::ConvertBlendFunc(mState.sourceBlendAlpha));\r
-                       device->setDestBlendFactorAlpha(es2sw::ConvertBlendFunc(mState.destBlendAlpha));\r
-                       device->setBlendOperationAlpha(es2sw::ConvertBlendOp(mState.blendEquationAlpha));\r
+            device->setSourceBlendFactorAlpha(rad2sw::ConvertBlendFunc(mState.sourceBlendAlpha));\r
+                       device->setDestBlendFactorAlpha(rad2sw::ConvertBlendFunc(mState.destBlendAlpha));\r
+                       device->setBlendOperationAlpha(rad2sw::ConvertBlendOp(mState.blendEquationAlpha));\r
         }\r
         else\r
         {\r
@@ -1803,46 +1803,46 @@ void Context::applyState(GLenum drawMode)
                        if(mState.frontFace == GL_CCW)\r
                        {\r
                                device->setStencilWriteMask(mState.stencilWritemask);\r
-                               device->setStencilCompare(es2sw::ConvertStencilComparison(mState.stencilFunc));\r
+                               device->setStencilCompare(rad2sw::ConvertStencilComparison(mState.stencilFunc));\r
 \r
                                device->setStencilReference((mState.stencilRef < (GLint)maxStencil) ? mState.stencilRef : maxStencil);\r
                                device->setStencilMask(mState.stencilMask);\r
 \r
-                               device->setStencilFailOperation(es2sw::ConvertStencilOp(mState.stencilFail));\r
-                               device->setStencilZFailOperation(es2sw::ConvertStencilOp(mState.stencilPassDepthFail));\r
-                               device->setStencilPassOperation(es2sw::ConvertStencilOp(mState.stencilPassDepthPass));\r
+                               device->setStencilFailOperation(rad2sw::ConvertStencilOp(mState.stencilFail));\r
+                               device->setStencilZFailOperation(rad2sw::ConvertStencilOp(mState.stencilPassDepthFail));\r
+                               device->setStencilPassOperation(rad2sw::ConvertStencilOp(mState.stencilPassDepthPass));\r
 \r
                                device->setStencilWriteMaskCCW(mState.stencilBackWritemask);\r
-                               device->setStencilCompareCCW(es2sw::ConvertStencilComparison(mState.stencilBackFunc));\r
+                               device->setStencilCompareCCW(rad2sw::ConvertStencilComparison(mState.stencilBackFunc));\r
 \r
                                device->setStencilReferenceCCW((mState.stencilBackRef < (GLint)maxStencil) ? mState.stencilBackRef : maxStencil);\r
                                device->setStencilMaskCCW(mState.stencilBackMask);\r
 \r
-                               device->setStencilFailOperationCCW(es2sw::ConvertStencilOp(mState.stencilBackFail));\r
-                               device->setStencilZFailOperationCCW(es2sw::ConvertStencilOp(mState.stencilBackPassDepthFail));\r
-                               device->setStencilPassOperationCCW(es2sw::ConvertStencilOp(mState.stencilBackPassDepthPass));\r
+                               device->setStencilFailOperationCCW(rad2sw::ConvertStencilOp(mState.stencilBackFail));\r
+                               device->setStencilZFailOperationCCW(rad2sw::ConvertStencilOp(mState.stencilBackPassDepthFail));\r
+                               device->setStencilPassOperationCCW(rad2sw::ConvertStencilOp(mState.stencilBackPassDepthPass));\r
                        }\r
                        else\r
                        {\r
                                device->setStencilWriteMaskCCW(mState.stencilWritemask);\r
-                               device->setStencilCompareCCW(es2sw::ConvertStencilComparison(mState.stencilFunc));\r
+                               device->setStencilCompareCCW(rad2sw::ConvertStencilComparison(mState.stencilFunc));\r
 \r
                                device->setStencilReferenceCCW((mState.stencilRef < (GLint)maxStencil) ? mState.stencilRef : maxStencil);\r
                                device->setStencilMaskCCW(mState.stencilMask);\r
 \r
-                               device->setStencilFailOperationCCW(es2sw::ConvertStencilOp(mState.stencilFail));\r
-                               device->setStencilZFailOperationCCW(es2sw::ConvertStencilOp(mState.stencilPassDepthFail));\r
-                               device->setStencilPassOperationCCW(es2sw::ConvertStencilOp(mState.stencilPassDepthPass));\r
+                               device->setStencilFailOperationCCW(rad2sw::ConvertStencilOp(mState.stencilFail));\r
+                               device->setStencilZFailOperationCCW(rad2sw::ConvertStencilOp(mState.stencilPassDepthFail));\r
+                               device->setStencilPassOperationCCW(rad2sw::ConvertStencilOp(mState.stencilPassDepthPass));\r
 \r
                                device->setStencilWriteMask(mState.stencilBackWritemask);\r
-                               device->setStencilCompare(es2sw::ConvertStencilComparison(mState.stencilBackFunc));\r
+                               device->setStencilCompare(rad2sw::ConvertStencilComparison(mState.stencilBackFunc));\r
 \r
                                device->setStencilReference((mState.stencilBackRef < (GLint)maxStencil) ? mState.stencilBackRef : maxStencil);\r
                                device->setStencilMask(mState.stencilBackMask);\r
 \r
-                               device->setStencilFailOperation(es2sw::ConvertStencilOp(mState.stencilBackFail));\r
-                               device->setStencilZFailOperation(es2sw::ConvertStencilOp(mState.stencilBackPassDepthFail));\r
-                               device->setStencilPassOperation(es2sw::ConvertStencilOp(mState.stencilBackPassDepthPass));\r
+                               device->setStencilFailOperation(rad2sw::ConvertStencilOp(mState.stencilBackFail));\r
+                               device->setStencilZFailOperation(rad2sw::ConvertStencilOp(mState.stencilBackPassDepthFail));\r
+                               device->setStencilPassOperation(rad2sw::ConvertStencilOp(mState.stencilBackPassDepthPass));\r
                        }\r
         }\r
         else\r
@@ -1856,7 +1856,7 @@ void Context::applyState(GLenum drawMode)
 \r
     if(mMaskStateDirty)\r
     {\r
-               device->setColorWriteMask(0, es2sw::ConvertColorMask(mState.colorMaskRed, mState.colorMaskGreen, mState.colorMaskBlue, mState.colorMaskAlpha));\r
+               device->setColorWriteMask(0, rad2sw::ConvertColorMask(mState.colorMaskRed, mState.colorMaskGreen, mState.colorMaskBlue, mState.colorMaskAlpha));\r
                device->setDepthWriteEnable(mState.depthMask);\r
 \r
         mMaskStateDirty = false;\r
@@ -2042,16 +2042,16 @@ void Context::applyTextures(sw::SamplerType samplerType)
                 GLenum magFilter = texture->getMagFilter();\r
                                GLenum maxAnisotropy = texture->getMaxAnisotropy();\r
 \r
-                               device->setAddressingModeU(samplerType, samplerIndex, es2sw::ConvertTextureWrap(wrapS));\r
-                device->setAddressingModeV(samplerType, samplerIndex, es2sw::ConvertTextureWrap(wrapT));\r
+                               device->setAddressingModeU(samplerType, samplerIndex, rad2sw::ConvertTextureWrap(wrapS));\r
+                device->setAddressingModeV(samplerType, samplerIndex, rad2sw::ConvertTextureWrap(wrapT));\r
 \r
                                sw::FilterType minFilter;\r
                                sw::MipmapType mipFilter;\r
-                es2sw::ConvertMinFilter(texFilter, &minFilter, &mipFilter, maxAnisotropy);\r
-                       //      ASSERT(minFilter == es2sw::ConvertMagFilter(magFilter));\r
+                rad2sw::ConvertMinFilter(texFilter, &minFilter, &mipFilter, maxAnisotropy);\r
+                       //      ASSERT(minFilter == rad2sw::ConvertMagFilter(magFilter));\r
 \r
                                device->setTextureFilter(samplerType, samplerIndex, minFilter);\r
-                       //      device->setTextureFilter(samplerType, samplerIndex, es2sw::ConvertMagFilter(magFilter));\r
+                       //      device->setTextureFilter(samplerType, samplerIndex, rad2sw::ConvertMagFilter(magFilter));\r
                                device->setMipmapFilter(samplerType, samplerIndex, mipFilter);\r
                                device->setMaxAnisotropy(samplerType, samplerIndex, maxAnisotropy);                \r
 \r
@@ -2422,7 +2422,7 @@ void Context::drawArrays(GLenum mode, GLint first, GLsizei count)
     PrimitiveType primitiveType;\r
     int primitiveCount;\r
 \r
-    if(!es2sw::ConvertPrimitiveType(mode, count, primitiveType, primitiveCount))\r
+    if(!rad2sw::ConvertPrimitiveType(mode, count, primitiveType, primitiveCount))\r
         return error(GL_INVALID_ENUM);\r
 \r
     if(primitiveCount <= 0)\r
@@ -2472,7 +2472,7 @@ void Context::drawElements(GLenum mode, GLsizei count, GLenum type, const void *
     PrimitiveType primitiveType;\r
     int primitiveCount;\r
 \r
-    if(!es2sw::ConvertPrimitiveType(mode, count, primitiveType, primitiveCount))\r
+    if(!rad2sw::ConvertPrimitiveType(mode, count, primitiveType, primitiveCount))\r
         return error(GL_INVALID_ENUM);\r
 \r
     if(primitiveCount <= 0)\r
@@ -3022,7 +3022,7 @@ void Context::blitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1
 \r
 void Context::bindTexImage(egl::Surface *surface)\r
 {\r
-       es2::Texture2D *textureObject = getTexture2D();\r
+       rad::Texture2D *textureObject = getTexture2D();\r
 \r
     if(textureObject)\r
     {\r
@@ -3053,14 +3053,14 @@ EGLenum Context::validateSharedImage(EGLenum target, GLuint name, GLuint texture
         return EGL_BAD_PARAMETER;\r
     }\r
        \r
-    if(textureLevel >= es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS)\r
+    if(textureLevel >= rad::IMPLEMENTATION_MAX_TEXTURE_LEVELS)\r
     {\r
         return EGL_BAD_MATCH;\r
     }\r
 \r
     if(textureTarget != GL_NONE)\r
     {\r
-        es2::Texture *texture = getTexture(name);\r
+        rad::Texture *texture = getTexture(name);\r
 \r
         if(!texture || texture->getTarget() != textureTarget)\r
         {\r
@@ -3084,7 +3084,7 @@ EGLenum Context::validateSharedImage(EGLenum target, GLuint name, GLuint texture
     }\r
     else if(target == EGL_GL_RENDERBUFFER_KHR)\r
     {\r
-        es2::Renderbuffer *renderbuffer = getRenderbuffer(name);\r
+        rad::Renderbuffer *renderbuffer = getRenderbuffer(name);\r
 \r
         if(!renderbuffer)\r
         {\r
@@ -3118,13 +3118,13 @@ egl::Image *Context::createSharedImage(EGLenum target, GLuint name, GLuint textu
 \r
     if(textureTarget != GL_NONE)\r
     {\r
-        es2::Texture *texture = getTexture(name);\r
+        rad::Texture *texture = getTexture(name);\r
 \r
         return texture->createSharedImage(textureTarget, textureLevel);\r
     }\r
     else if(target == EGL_GL_RENDERBUFFER_KHR)\r
     {\r
-        es2::Renderbuffer *renderbuffer = getRenderbuffer(name);\r
+        rad::Renderbuffer *renderbuffer = getRenderbuffer(name);\r
 \r
         return renderbuffer->createSharedImage();\r
     }\r
@@ -3138,7 +3138,7 @@ Device *Context::getDevice()
        if(!device)\r
        {\r
                sw::Context *context = new sw::Context();\r
-               device = new es2::Device(context);\r
+               device = new rad::Device(context);\r
        }\r
 \r
        return device;\r
@@ -3149,8 +3149,8 @@ Device *Context::getDevice()
 // Exported functions for use by EGL\r
 extern "C"\r
 {\r
-       es2::Context *glCreateContext(const egl::Config *config, const es2::Context *shareContext)\r
+       rad::Context *glCreateContext(const egl::Config *config, const rad::Context *shareContext)\r
        {\r
-               return new es2::Context(config, shareContext);\r
+               return new rad::Context(config, shareContext);\r
        }\r
 }\r
index 073c97d..3f18600 100644 (file)
@@ -38,7 +38,7 @@ class Surface;
 class Config;\r
 }\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 struct TranslatedAttribute;\r
 struct TranslatedIndexData;\r
index 2ff7774..4cfc90c 100644 (file)
@@ -27,7 +27,7 @@
 \r
 bool localShaderConstants = false;\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
        using namespace sw;\r
 \r
index 92a3a11..ef6f69b 100644 (file)
@@ -19,7 +19,7 @@ namespace egl
        class Image;\r
 }\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
        class Texture;\r
        class Image;\r
index e79077b..f468244 100644 (file)
@@ -16,7 +16,7 @@
 #include "main.h"\r
 #include "Common/Thread.hpp"\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 \r
 Fence::Fence()\r
index a2b5bab..7359688 100644 (file)
@@ -17,7 +17,7 @@
 #define GL_APICALL\r
 #include <GLES2/gl2.h>\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 \r
 class Fence\r
index c98973c..dad609a 100644 (file)
@@ -19,7 +19,7 @@
 #include "Texture.h"
 #include "utilities.h"
 
-namespace es2
+namespace rad
 {
 
 Framebuffer::Framebuffer()
@@ -245,7 +245,7 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples)
 
                if(mColorbufferType == GL_RENDERBUFFER)
                {
-                       if(!es2::IsColorRenderable(colorbuffer->getFormat()))
+                       if(!rad::IsColorRenderable(colorbuffer->getFormat()))
                        {
                                return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
                        }
@@ -262,7 +262,7 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples)
                                return GL_FRAMEBUFFER_UNSUPPORTED;
                        }
 
-                       if(es2::IsDepthTexture(format) || es2::IsStencilTexture(format))
+                       if(rad::IsDepthTexture(format) || rad::IsStencilTexture(format))
                        {
                                return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
                        }
@@ -297,14 +297,14 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples)
 
                if(mDepthbufferType == GL_RENDERBUFFER)
                {
-                       if(!es2::IsDepthRenderable(depthbuffer->getFormat()))
+                       if(!rad::IsDepthRenderable(depthbuffer->getFormat()))
                        {
                                return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
                        }
                }
                else if(IsTextureTarget(mDepthbufferType))
                {
-                       if(!es2::IsDepthTexture(depthbuffer->getFormat()))
+                       if(!rad::IsDepthTexture(depthbuffer->getFormat()))
                        {
                                return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
                        }
@@ -347,7 +347,7 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples)
 
                if(mStencilbufferType == GL_RENDERBUFFER)
                {
-                       if(!es2::IsStencilRenderable(stencilbuffer->getFormat()))
+                       if(!rad::IsStencilRenderable(stencilbuffer->getFormat()))
                        {
                                return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
                        }
@@ -356,7 +356,7 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples)
                {
                        GLenum internalformat = stencilbuffer->getFormat();
 
-                       if(!es2::IsStencilTexture(internalformat))
+                       if(!rad::IsStencilTexture(internalformat))
                        {
                                return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
                        }
index df29240..db8688f 100644 (file)
@@ -21,7 +21,7 @@
 #define GL_APICALL\r
 #include <GLES2/gl2.h>\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 class Renderbuffer;\r
 class Colorbuffer;\r
index 85813f2..fc81c48 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "main.h"
 
-namespace es2
+namespace rad
 {
 
 HandleAllocator::HandleAllocator() : mBaseValue(1), mNextValue(1)
index 8079d12..3d96d5b 100644 (file)
@@ -20,7 +20,7 @@
 \r
 #include <vector>\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 \r
 class HandleAllocator\r
index 541923f..4f41dc0 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <GLES2/gl2ext.h>
 
-namespace es2
+namespace rad
 {
        static sw::Resource *getParentResource(Texture *texture)
        {
index 70baa6d..a3c4a67 100644 (file)
@@ -18,7 +18,7 @@
 #define GL_APICALL
 #include <GLES2/gl2.h>
 
-namespace es2
+namespace rad
 {
        class Texture;
 
index a2b468c..3ab88c0 100644 (file)
@@ -25,7 +25,7 @@ namespace
     enum { INITIAL_INDEX_BUFFER_SIZE = 4096 * sizeof(GLuint) };\r
 }\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 \r
 IndexDataManager::IndexDataManager()\r
index 0bab66e..c7e5f27 100644 (file)
@@ -20,7 +20,7 @@
 #define GL_APICALL\r
 #include <GLES2/gl2.h>\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 \r
 struct TranslatedIndexData\r
index 03042fa..84faf19 100644 (file)
@@ -24,7 +24,7 @@
 #include <string>\r
 #include <stdlib.h>\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
        unsigned int Program::currentSerial = 1;\r
 \r
index dd87fb2..ba47c34 100644 (file)
@@ -24,7 +24,7 @@
 #include <vector>\r
 #include <set>\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
        class Device;\r
        class ResourceManager;\r
@@ -163,7 +163,7 @@ namespace es2
                static unsigned int issueSerial();\r
 \r
        private:\r
-               es2::Device *device;\r
+               rad::Device *device;\r
                FragmentShader *fragmentShader;\r
                VertexShader *vertexShader;\r
 \r
index 97c4efd..d91bfa6 100644 (file)
@@ -9,14 +9,14 @@
 // or implied, including but not limited to any patent rights, are granted to you.\r
 //\r
 \r
-// Query.cpp: Implements the es2::Query class\r
+// Query.cpp: Implements the rad::Query class\r
 \r
 #include "Query.h"\r
 \r
 #include "main.h"\r
 #include "Common/Thread.hpp"\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 \r
 Query::Query(GLuint id, GLenum type) : RefCountObject(id)\r
index 6811939..bc95dda 100644 (file)
@@ -9,7 +9,7 @@
 // or implied, including but not limited to any patent rights, are granted to you.\r
 //\r
 \r
-// Query.h: Defines the es2::Query class\r
+// Query.h: Defines the rad::Query class\r
 \r
 #ifndef LIBGLESV2_QUERY_H_\r
 #define LIBGLESV2_QUERY_H_\r
@@ -20,7 +20,7 @@
 #define GL_APICALL\r
 #include <GLES2/gl2.h>\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 \r
 class Query : public RefCountObject\r
index 3dfbf03..b69b0c7 100644 (file)
@@ -18,7 +18,7 @@
 
 #include "Common/Thread.hpp"
 
-namespace es2
+namespace rad
 {
 
 RefCountObject::RefCountObject(GLuint id)
index 25eae02..da19dda 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <cstddef>
 
-namespace es2
+namespace rad
 {
 
 class RefCountObject
index a88d222..06c023d 100644 (file)
@@ -19,7 +19,7 @@
 #include "Texture.h"
 #include "utilities.h"
 
-namespace es2
+namespace rad
 {
 RenderbufferInterface::RenderbufferInterface()
 {
@@ -38,32 +38,32 @@ void RenderbufferInterface::releaseProxy(const Renderbuffer *proxy)
 
 GLuint RenderbufferInterface::getRedSize() const
 {
-       return sw2es::GetRedSize(getInternalFormat());
+       return sw2rad::GetRedSize(getInternalFormat());
 }
 
 GLuint RenderbufferInterface::getGreenSize() const
 {
-       return sw2es::GetGreenSize(getInternalFormat());
+       return sw2rad::GetGreenSize(getInternalFormat());
 }
 
 GLuint RenderbufferInterface::getBlueSize() const
 {
-       return sw2es::GetBlueSize(getInternalFormat());
+       return sw2rad::GetBlueSize(getInternalFormat());
 }
 
 GLuint RenderbufferInterface::getAlphaSize() const
 {
-       return sw2es::GetAlphaSize(getInternalFormat());
+       return sw2rad::GetAlphaSize(getInternalFormat());
 }
 
 GLuint RenderbufferInterface::getDepthSize() const
 {
-       return sw2es::GetDepthSize(getInternalFormat());
+       return sw2rad::GetDepthSize(getInternalFormat());
 }
 
 GLuint RenderbufferInterface::getStencilSize() const
 {
-       return sw2es::GetStencilSize(getInternalFormat());
+       return sw2rad::GetStencilSize(getInternalFormat());
 }
 
 ///// RenderbufferTexture2D Implementation ////////
@@ -360,7 +360,7 @@ Colorbuffer::Colorbuffer(egl::Image *renderTarget) : mRenderTarget(renderTarget)
                mWidth = renderTarget->getWidth();
                mHeight = renderTarget->getHeight();
                internalFormat = renderTarget->getInternalFormat();
-               format = sw2es::ConvertBackBufferFormat(internalFormat);
+               format = sw2rad::ConvertBackBufferFormat(internalFormat);
                mSamples = renderTarget->getMultiSampleDepth() & ~1;
        }
 }
@@ -369,7 +369,7 @@ Colorbuffer::Colorbuffer(int width, int height, GLenum format, GLsizei samples)
 {
        Device *device = getDevice();
 
-       sw::Format requestedFormat = es2sw::ConvertRenderbufferFormat(format);
+       sw::Format requestedFormat = rad2sw::ConvertRenderbufferFormat(format);
        int supportedSamples = Context::getSupportedMultiSampleDepth(requestedFormat, samples);
 
        if(width > 0 && height > 0)
@@ -437,7 +437,7 @@ DepthStencilbuffer::DepthStencilbuffer(egl::Image *depthStencil) : mDepthStencil
                mWidth = depthStencil->getWidth();
                mHeight = depthStencil->getHeight();
                internalFormat = depthStencil->getInternalFormat();
-               format = sw2es::ConvertDepthStencilFormat(internalFormat);
+               format = sw2rad::ConvertDepthStencilFormat(internalFormat);
                mSamples = depthStencil->getMultiSampleDepth() & ~1;
        }
 }
index 53bae78..c3cb53c 100644 (file)
@@ -23,7 +23,7 @@
 #define GL_APICALL\r
 #include <GLES2/gl2.h>\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 class Texture2D;\r
 class TextureCubeMap;\r
index c2b945c..14e2bc8 100644 (file)
@@ -20,7 +20,7 @@
 #include "Shader.h"
 #include "Texture.h"
 
-namespace es2
+namespace rad
 {
 ResourceManager::ResourceManager()
 {
index 6a7a8d5..9e4f992 100644 (file)
@@ -22,7 +22,7 @@
 \r
 #include <map>\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 class Buffer;\r
 class Shader;\r
index d88e561..e8d2925 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <string>
 
-namespace es2
+namespace rad
 {
 Shader::Shader(ResourceManager *manager, GLuint handle) : mHandle(handle), mResourceManager(manager)
 {
index adf1c96..4eb9312 100644 (file)
@@ -32,7 +32,7 @@ namespace sh
        class OutputASM;\r
 }\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 struct Varying\r
 {\r
@@ -46,7 +46,7 @@ struct Varying
                return arraySize >= 1;\r
        }\r
 \r
-       int size() const   // Unify with es2::Uniform?\r
+       int size() const   // Unify with rad::Uniform?\r
        {\r
                return arraySize > 0 ? arraySize : 1;\r
        }\r
index 318ccaf..2804978 100644 (file)
@@ -25,7 +25,7 @@
 \r
 #include <algorithm>\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 \r
 Texture::Texture(GLuint id) : RefCountObject(id)\r
@@ -1156,17 +1156,17 @@ void TextureExternal::setImage(Image *sharedImage)
 // Exported functions for use by EGL\r
 extern "C"\r
 {\r
-       es2::Image *createBackBuffer(int width, int height, const egl::Config *config)\r
+       rad::Image *createBackBuffer(int width, int height, const egl::Config *config)\r
        {\r
                if(config)\r
                {\r
-                       return new es2::Image(0, width, height, config->mAlphaSize ? GL_RGBA : GL_RGB, GL_UNSIGNED_BYTE);\r
+                       return new rad::Image(0, width, height, config->mAlphaSize ? GL_RGBA : GL_RGB, GL_UNSIGNED_BYTE);\r
                }\r
 \r
                return 0;\r
        }\r
 \r
-       es2::Image *createDepthStencil(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard)\r
+       rad::Image *createDepthStencil(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard)\r
        {\r
                if(width == 0 || height == 0 || height > OUTLINE_RESOLUTION)\r
                {\r
@@ -1199,7 +1199,7 @@ extern "C"
                        UNREACHABLE();\r
                }\r
 \r
-               es2::Image *surface = new es2::Image(0, width, height, format, multiSampleDepth, lockable, true);\r
+               rad::Image *surface = new rad::Image(0, width, height, format, multiSampleDepth, lockable, true);\r
 \r
                if(!surface)\r
                {\r
index 2d1e2fe..8411da7 100644 (file)
@@ -33,7 +33,7 @@ class Surface;
 class Config;\r
 }\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 class Framebuffer;\r
 \r
index 37875c0..47479fe 100644 (file)
@@ -24,7 +24,7 @@ namespace
     enum {INITIAL_STREAM_BUFFER_SIZE = 1024 * 1024};\r
 }\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 \r
 VertexDataManager::VertexDataManager(Context *context) : mContext(context)\r
index ee32c03..503a143 100644 (file)
@@ -21,7 +21,7 @@
 #define GL_APICALL\r
 #include <GLES2/gl2.h>\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
 \r
 struct TranslatedAttribute\r
similarity index 83%
rename from src/Radiance/libRAD/libGLESv2.cbp
rename to src/Radiance/libRAD/libRAD.cbp
index a045a3a..651969c 100644 (file)
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-       <FileVersion major="1" minor="6" />
-       <Project>
-               <Option title="libGLESv2" />
-               <Option pch_mode="2" />
-               <Option compiler="gcc" />
-               <Build>
-                       <Target title="Debug x86">
-                               <Option output="./../../bin/x86/Debug/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
-                               <Option object_output="obj/x86/Debug/" />
-                               <Option type="3" />
-                               <Option compiler="gcc" />
-                               <Option createDefFile="1" />
-                               <Option createStaticLib="1" />
-                               <Compiler>
-                                       <Add option="-g" />
-                                       <Add option="-m32" />
-                               </Compiler>
-                               <Linker>
-                                       <Add option="-m32" />
-                                       <Add library="./../../LLVM/bin/x86/Debug/libLLVM.a" />
-                               </Linker>
-                       </Target>
-                       <Target title="Release x86">
-                               <Option output="./../../bin/x86/Release/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
-                               <Option object_output="obj/x86/Release/" />
-                               <Option type="3" />
-                               <Option compiler="gcc" />
-                               <Option createDefFile="1" />
-                               <Option createStaticLib="1" />
-                               <Compiler>
-                                       <Add option="-march=i686" />
-                                       <Add option="-fomit-frame-pointer" />
-                                       <Add option="-O2" />
-                                       <Add option="-m32" />
-                                       <Add option="-ffunction-sections" />
-                                       <Add option="-fdata-sections" />
-                                       <Add option="-DNDEBUG" />
-                                       <Add option="-DANGLE_DISABLE_TRACE" />
-                               </Compiler>
-                               <Linker>
-                                       <Add option="-s" />
-                                       <Add option="-m32" />
-                                       <Add option="-Wl,--gc-sections" />
-                                       <Add library="./../../LLVM/bin/x86/Release/libLLVM.a" />
-                               </Linker>
-                       </Target>
-                       <Target title="Debug x64">
-                               <Option output="./../../bin/x64/Debug/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
-                               <Option object_output="obj/x64/Debug/" />
-                               <Option type="3" />
-                               <Option compiler="gcc" />
-                               <Option createDefFile="1" />
-                               <Option createStaticLib="1" />
-                               <Compiler>
-                                       <Add option="-g" />
-                                       <Add option="-m64" />
-                                       <Add option="-fPIC" />
-                               </Compiler>
-                               <Linker>
-                                       <Add option="-m64" />
-                                       <Add library="./../../LLVM/bin/x64/Debug/libLLVM.a" />
-                               </Linker>
-                       </Target>
-                       <Target title="Release x64">
-                               <Option output="./../../bin/x64/Release/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
-                               <Option object_output="obj/x64/Release/" />
-                               <Option type="3" />
-                               <Option compiler="gcc" />
-                               <Option createDefFile="1" />
-                               <Option createStaticLib="1" />
-                               <Compiler>
-                                       <Add option="-march=core2" />
-                                       <Add option="-fomit-frame-pointer" />
-                                       <Add option="-O2" />
-                                       <Add option="-m64" />
-                                       <Add option="-fPIC" />
-                                       <Add option="-ffunction-sections" />
-                                       <Add option="-fdata-sections" />
-                                       <Add option="-DNDEBUG" />
-                                       <Add option="-DANGLE_DISABLE_TRACE" />
-                               </Compiler>
-                               <Linker>
-                                       <Add option="-s" />
-                                       <Add option="-m64" />
-                                       <Add option="-Wl,--gc-sections" />
-                                       <Add library="./../../LLVM/bin/x64/Release/libLLVM.a" />
-                               </Linker>
-                       </Target>
-               </Build>
-               <Compiler>
-                       <Add option="-Wall" />
-                       <Add option="-fexceptions" />
-                       <Add option="-fno-operator-names" />
-                       <Add option="-ffriend-injection" />
-                       <Add option="-msse2" />
-                       <Add option="-D__STDC_LIMIT_MACROS" />
-                       <Add option="-D__STDC_CONSTANT_MACROS" />
-                       <Add directory="./../" />
-                       <Add directory="./../include/" />
-                       <Add directory="./../../" />
-                       <Add directory="./../../LLVM/include-linux/" />
-                       <Add directory="./../../LLVM/include/" />
-                       <Add directory="./../../LLVM/lib/Target/X86" />
-                       <Add directory="./../../Renderer/" />
-                       <Add directory="./../../Common/" />
-                       <Add directory="./../../Shader/" />
-                       <Add directory="./../../Main/" />
-               </Compiler>
-               <Linker>
-                       <Add option="-Wl,--version-script=./exports.map" />
-                       <Add library="pthread" />
-                       <Add library="X11" />
-                       <Add library="Xext" />
-               </Linker>
-               <Unit filename="./../../Common/CPUID.cpp" />
-               <Unit filename="./../../Common/CPUID.hpp" />
-               <Unit filename="./../../Common/Configurator.cpp" />
-               <Unit filename="./../../Common/Configurator.hpp" />
-               <Unit filename="./../../Common/Debug.cpp" />
-               <Unit filename="./../../Common/Debug.hpp" />
-               <Unit filename="./../../Common/ExceptionHandling.hpp" />
-               <Unit filename="./../../Common/Half.cpp" />
-               <Unit filename="./../../Common/Half.hpp" />
-               <Unit filename="./../../Common/Math.cpp" />
-               <Unit filename="./../../Common/Math.hpp" />
-               <Unit filename="./../../Common/Memory.cpp" />
-               <Unit filename="./../../Common/Memory.hpp" />
-               <Unit filename="./../../Common/MetaMacro.hpp" />
-               <Unit filename="./../../Common/MutexLock.hpp" />
-               <Unit filename="./../../Common/Resource.cpp" />
-               <Unit filename="./../../Common/Resource.hpp" />
-               <Unit filename="./../../Common/Socket.cpp" />
-               <Unit filename="./../../Common/Socket.hpp" />
-               <Unit filename="./../../Common/Thread.cpp" />
-               <Unit filename="./../../Common/Thread.hpp" />
-               <Unit filename="./../../Common/Timer.cpp" />
-               <Unit filename="./../../Common/Timer.hpp" />
-               <Unit filename="./../../Common/Types.hpp" />
-               <Unit filename="./../../Common/Version.h" />
-               <Unit filename="./../common/debug.cpp" />
-               <Unit filename="./../common/debug.h" />
-               <Unit filename="../compiler/AnalyzeCallDepth.cpp" />
-               <Unit filename="../compiler/AnalyzeCallDepth.h" />
-               <Unit filename="../compiler/BaseTypes.h" />
-               <Unit filename="../compiler/Common.h" />
-               <Unit filename="../compiler/Compiler.cpp" />
-               <Unit filename="../compiler/ConstantUnion.h" />
-               <Unit filename="../compiler/Diagnostics.cpp" />
-               <Unit filename="../compiler/Diagnostics.h" />
-               <Unit filename="../compiler/DirectiveHandler.cpp" />
-               <Unit filename="../compiler/DirectiveHandler.h" />
-               <Unit filename="../compiler/ExtensionBehavior.h" />
-               <Unit filename="../compiler/InfoSink.cpp" />
-               <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" />
-               <Unit filename="../compiler/IntermTraverse.cpp" />
-               <Unit filename="../compiler/Intermediate.cpp" />
-               <Unit filename="../compiler/MMap.h" />
-               <Unit filename="../compiler/OutputASM.cpp" />
-               <Unit filename="../compiler/OutputASM.h" />
-               <Unit filename="../compiler/ParseHelper.cpp" />
-               <Unit filename="../compiler/ParseHelper.h" />
-               <Unit filename="../compiler/PoolAlloc.cpp" />
-               <Unit filename="../compiler/PoolAlloc.h" />
-               <Unit filename="../compiler/Pragma.h" />
-               <Unit filename="../compiler/RemoveTree.cpp" />
-               <Unit filename="../compiler/RemoveTree.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" />
-               <Unit filename="../compiler/TranslatorASM.h" />
-               <Unit filename="../compiler/Types.h" />
-               <Unit filename="../compiler/ValidateLimitations.cpp" />
-               <Unit filename="../compiler/ValidateLimitations.h" />
-               <Unit filename="../compiler/debug.cpp" />
-               <Unit filename="../compiler/debug.h" />
-               <Unit filename="../compiler/glslang.h" />
-               <Unit filename="../compiler/glslang_lex.cpp" />
-               <Unit filename="../compiler/glslang_tab.cpp" />
-               <Unit filename="../compiler/glslang_tab.h" />
-               <Unit filename="../compiler/intermOut.cpp" />
-               <Unit filename="../compiler/intermediate.h" />
-               <Unit filename="../compiler/localintermediate.h" />
-               <Unit filename="../compiler/osinclude.h" />
-               <Unit filename="../compiler/ossource_posix.cpp" />
-               <Unit filename="../compiler/parseConst.cpp" />
-               <Unit filename="../compiler/preprocessor/Diagnostics.cpp" />
-               <Unit filename="../compiler/preprocessor/Diagnostics.h" />
-               <Unit filename="../compiler/preprocessor/DirectiveHandler.cpp" />
-               <Unit filename="../compiler/preprocessor/DirectiveHandler.h" />
-               <Unit filename="../compiler/preprocessor/DirectiveParser.cpp" />
-               <Unit filename="../compiler/preprocessor/DirectiveParser.h" />
-               <Unit filename="../compiler/preprocessor/ExpressionParser.cpp" />
-               <Unit filename="../compiler/preprocessor/ExpressionParser.h" />
-               <Unit filename="../compiler/preprocessor/Input.cpp" />
-               <Unit filename="../compiler/preprocessor/Input.h" />
-               <Unit filename="../compiler/preprocessor/Lexer.cpp" />
-               <Unit filename="../compiler/preprocessor/Lexer.h" />
-               <Unit filename="../compiler/preprocessor/Macro.cpp" />
-               <Unit filename="../compiler/preprocessor/Macro.h" />
-               <Unit filename="../compiler/preprocessor/MacroExpander.cpp" />
-               <Unit filename="../compiler/preprocessor/MacroExpander.h" />
-               <Unit filename="../compiler/preprocessor/Preprocessor.cpp" />
-               <Unit filename="../compiler/preprocessor/Preprocessor.h" />
-               <Unit filename="../compiler/preprocessor/SourceLocation.h" />
-               <Unit filename="../compiler/preprocessor/Token.cpp" />
-               <Unit filename="../compiler/preprocessor/Token.h" />
-               <Unit filename="../compiler/preprocessor/Tokenizer.cpp" />
-               <Unit filename="../compiler/preprocessor/Tokenizer.h" />
-               <Unit filename="../compiler/preprocessor/length_limits.h" />
-               <Unit filename="../compiler/preprocessor/numeric_lex.h" />
-               <Unit filename="../compiler/preprocessor/pp_utils.h" />
-               <Unit filename="../compiler/util.cpp" />
-               <Unit filename="../compiler/util.h" />
-               <Unit filename="./../include/EGL/egl.h" />
-               <Unit filename="./../include/EGL/eglext.h" />
-               <Unit filename="./../include/EGL/eglplatform.h" />
-               <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="./../libGLESv2/Buffer.cpp" />
-               <Unit filename="./../libGLESv2/Buffer.h" />
-               <Unit filename="./../libGLESv2/Context.cpp" />
-               <Unit filename="./../libGLESv2/Context.h" />
-               <Unit filename="./../libGLESv2/Device.cpp" />
-               <Unit filename="./../libGLESv2/Device.hpp" />
-               <Unit filename="./../libGLESv2/Fence.cpp" />
-               <Unit filename="./../libGLESv2/Fence.h" />
-               <Unit filename="./../libGLESv2/Framebuffer.cpp" />
-               <Unit filename="./../libGLESv2/Framebuffer.h" />
-               <Unit filename="./../libGLESv2/HandleAllocator.cpp" />
-               <Unit filename="./../libGLESv2/HandleAllocator.h" />
-               <Unit filename="./../libGLESv2/Image.cpp" />
-               <Unit filename="./../libGLESv2/Image.hpp" />
-               <Unit filename="./../libGLESv2/IndexDataManager.cpp" />
-               <Unit filename="./../libGLESv2/IndexDataManager.h" />
-               <Unit filename="./../libGLESv2/Program.cpp" />
-               <Unit filename="./../libGLESv2/Program.h" />
-               <Unit filename="./../libGLESv2/Query.cpp" />
-               <Unit filename="./../libGLESv2/Query.h" />
-               <Unit filename="./../libGLESv2/RefCountObject.cpp" />
-               <Unit filename="./../libGLESv2/RefCountObject.h" />
-               <Unit filename="./../libGLESv2/Renderbuffer.cpp" />
-               <Unit filename="./../libGLESv2/Renderbuffer.h" />
-               <Unit filename="./../libGLESv2/ResourceManager.cpp" />
-               <Unit filename="./../libGLESv2/ResourceManager.h" />
-               <Unit filename="./../libGLESv2/Shader.cpp" />
-               <Unit filename="./../libGLESv2/Shader.h" />
-               <Unit filename="./../libGLESv2/Texture.cpp" />
-               <Unit filename="./../libGLESv2/Texture.h" />
-               <Unit filename="./../libGLESv2/Unknown.hpp" />
-               <Unit filename="./../libGLESv2/VertexDataManager.cpp" />
-               <Unit filename="./../libGLESv2/VertexDataManager.h" />
-               <Unit filename="./../libGLESv2/libGLESv2.cpp" />
-               <Unit filename="./../libGLESv2/main.cpp" />
-               <Unit filename="./../libGLESv2/main.h" />
-               <Unit filename="./../libGLESv2/mathutil.h" />
-               <Unit filename="./../libGLESv2/resource.h" />
-               <Unit filename="./../libGLESv2/utilities.cpp" />
-               <Unit filename="./../libGLESv2/utilities.h" />
-               <Unit filename="./../libGLESv2/vertexconversion.h" />
-               <Unit filename="./../../Main/Config.cpp" />
-               <Unit filename="./../../Main/Config.hpp" />
-               <Unit filename="./../../Main/FrameBuffer.cpp" />
-               <Unit filename="./../../Main/FrameBuffer.hpp" />
-               <Unit filename="./../../Main/FrameBufferX11.cpp" />
-               <Unit filename="./../../Main/FrameBufferX11.hpp" />
-               <Unit filename="./../../Main/Logo.cpp" />
-               <Unit filename="./../../Main/Register.cpp" />
-               <Unit filename="./../../Main/Register.hpp" />
-               <Unit filename="./../../Main/SwiftConfig.cpp" />
-               <Unit filename="./../../Main/SwiftConfig.hpp" />
-               <Unit filename="./../../Main/crc.c">
-                       <Option compilerVar="CC" />
-               </Unit>
-               <Unit filename="./../../Main/crc.h" />
-               <Unit filename="./../../Main/serialcommon.h" />
-               <Unit filename="./../../Main/serialvalid.cpp" />
-               <Unit filename="./../../Main/serialvalid.h" />
-               <Unit filename="./../../Reactor/Routine.cpp" />
-               <Unit filename="./../../Reactor/Routine.hpp" />
-               <Unit filename="./../../Reactor/RoutineManager.cpp" />
-               <Unit filename="./../../Reactor/RoutineManager.hpp" />
-               <Unit filename="./../../Reactor/Nucleus.cpp" />
-               <Unit filename="./../../Reactor/Nucleus.hpp" />
-               <Unit filename="./../../Reactor/Reactor.hpp" />
-               <Unit filename="./../../Reactor/x86.hpp" />
-               <Unit filename="./../../Renderer/Blitter.cpp" />
-               <Unit filename="./../../Renderer/Blitter.hpp" />
-               <Unit filename="./../../Renderer/Clipper.cpp" />
-               <Unit filename="./../../Renderer/Clipper.hpp" />
-               <Unit filename="./../../Renderer/Color.cpp" />
-               <Unit filename="./../../Renderer/Color.hpp" />
-               <Unit filename="./../../Renderer/Context.cpp" />
-               <Unit filename="./../../Renderer/Context.hpp" />
-               <Unit filename="./../../Renderer/LRUCache.hpp" />
-               <Unit filename="./../../Renderer/Matrix.cpp" />
-               <Unit filename="./../../Renderer/Matrix.hpp" />
-               <Unit filename="./../../Renderer/PixelProcessor.cpp" />
-               <Unit filename="./../../Renderer/PixelProcessor.hpp" />
-               <Unit filename="./../../Renderer/Plane.cpp" />
-               <Unit filename="./../../Renderer/Plane.hpp" />
-               <Unit filename="./../../Renderer/Point.cpp" />
-               <Unit filename="./../../Renderer/Point.hpp" />
-               <Unit filename="./../../Renderer/Polygon.hpp" />
-               <Unit filename="./../../Renderer/Primitive.hpp" />
-               <Unit filename="./../../Renderer/QuadRasterizer.cpp" />
-               <Unit filename="./../../Renderer/QuadRasterizer.hpp" />
-               <Unit filename="./../../Renderer/Rasterizer.cpp" />
-               <Unit filename="./../../Renderer/Rasterizer.hpp" />
-               <Unit filename="./../../Renderer/Renderer.cpp" />
-               <Unit filename="./../../Renderer/Renderer.hpp" />
-               <Unit filename="./../../Renderer/Sampler.cpp" />
-               <Unit filename="./../../Renderer/Sampler.hpp" />
-               <Unit filename="./../../Renderer/SetupProcessor.cpp" />
-               <Unit filename="./../../Renderer/SetupProcessor.hpp" />
-               <Unit filename="./../../Renderer/Stream.hpp" />
-               <Unit filename="./../../Renderer/Surface.cpp" />
-               <Unit filename="./../../Renderer/Surface.hpp" />
-               <Unit filename="./../../Renderer/TextureStage.cpp" />
-               <Unit filename="./../../Renderer/TextureStage.hpp" />
-               <Unit filename="./../../Renderer/Triangle.hpp" />
-               <Unit filename="./../../Renderer/Vector.cpp" />
-               <Unit filename="./../../Renderer/Vector.hpp" />
-               <Unit filename="./../../Renderer/Vertex.hpp" />
-               <Unit filename="./../../Renderer/VertexProcessor.cpp" />
-               <Unit filename="./../../Renderer/VertexProcessor.hpp" />
-               <Unit filename="./../../Shader/Constants.cpp" />
-               <Unit filename="./../../Shader/Constants.hpp" />
-               <Unit filename="./../../Shader/PixelRoutine.cpp" />
-               <Unit filename="./../../Shader/PixelRoutine.hpp" />
-               <Unit filename="./../../Shader/PixelShader.cpp" />
-               <Unit filename="./../../Shader/PixelShader.hpp" />
-               <Unit filename="./../../Shader/SamplerCore.cpp" />
-               <Unit filename="./../../Shader/SamplerCore.hpp" />
-               <Unit filename="./../../Shader/SetupRoutine.cpp" />
-               <Unit filename="./../../Shader/SetupRoutine.hpp" />
-               <Unit filename="./../../Shader/Shader.cpp" />
-               <Unit filename="./../../Shader/Shader.hpp" />
-               <Unit filename="./../../Shader/ShaderCore.cpp" />
-               <Unit filename="./../../Shader/ShaderCore.hpp" />
-               <Unit filename="./../../Shader/VertexPipeline.cpp" />
-               <Unit filename="./../../Shader/VertexPipeline.hpp" />
-               <Unit filename="./../../Shader/VertexProgram.cpp" />
-               <Unit filename="./../../Shader/VertexProgram.hpp" />
-               <Unit filename="./../../Shader/VertexRoutine.cpp" />
-               <Unit filename="./../../Shader/VertexRoutine.hpp" />
-               <Unit filename="./../../Shader/VertexShader.cpp" />
-               <Unit filename="./../../Shader/VertexShader.hpp" />
-               <Extensions>
-                       <code_completion />
-                       <debugger />
-               </Extensions>
-       </Project>
-</CodeBlocks_project_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>\r
+<CodeBlocks_project_file>\r
+       <FileVersion major="1" minor="6" />\r
+       <Project>\r
+               <Option title="libRAD" />\r
+               <Option pch_mode="2" />\r
+               <Option compiler="gcc" />\r
+               <Build>\r
+                       <Target title="Debug x86">\r
+                               <Option output="./../../bin/x86/Debug/libRAD.so.2" prefix_auto="0" extension_auto="0" />\r
+                               <Option object_output="obj/x86/Debug/" />\r
+                               <Option type="3" />\r
+                               <Option compiler="gcc" />\r
+                               <Option createDefFile="1" />\r
+                               <Option createStaticLib="1" />\r
+                               <Compiler>\r
+                                       <Add option="-g" />\r
+                                       <Add option="-m32" />\r
+                               </Compiler>\r
+                               <Linker>\r
+                                       <Add option="-m32" />\r
+                                       <Add library="./../../LLVM/bin/x86/Debug/libLLVM.a" />\r
+                               </Linker>\r
+                       </Target>\r
+                       <Target title="Release x86">\r
+                               <Option output="./../../bin/x86/Release/libRAD.so.2" prefix_auto="0" extension_auto="0" />\r
+                               <Option object_output="obj/x86/Release/" />\r
+                               <Option type="3" />\r
+                               <Option compiler="gcc" />\r
+                               <Option createDefFile="1" />\r
+                               <Option createStaticLib="1" />\r
+                               <Compiler>\r
+                                       <Add option="-march=i686" />\r
+                                       <Add option="-fomit-frame-pointer" />\r
+                                       <Add option="-O2" />\r
+                                       <Add option="-m32" />\r
+                                       <Add option="-ffunction-sections" />\r
+                                       <Add option="-fdata-sections" />\r
+                                       <Add option="-DNDEBUG" />\r
+                                       <Add option="-DANGLE_DISABLE_TRACE" />\r
+                               </Compiler>\r
+                               <Linker>\r
+                                       <Add option="-s" />\r
+                                       <Add option="-m32" />\r
+                                       <Add option="-Wl,--gc-sections" />\r
+                                       <Add library="./../../LLVM/bin/x86/Release/libLLVM.a" />\r
+                               </Linker>\r
+                       </Target>\r
+                       <Target title="Debug x64">\r
+                               <Option output="./../../bin/x64/Debug/libRAD.so.2" prefix_auto="0" extension_auto="0" />\r
+                               <Option object_output="obj/x64/Debug/" />\r
+                               <Option type="3" />\r
+                               <Option compiler="gcc" />\r
+                               <Option createDefFile="1" />\r
+                               <Option createStaticLib="1" />\r
+                               <Compiler>\r
+                                       <Add option="-g" />\r
+                                       <Add option="-m64" />\r
+                                       <Add option="-fPIC" />\r
+                               </Compiler>\r
+                               <Linker>\r
+                                       <Add option="-m64" />\r
+                                       <Add library="./../../LLVM/bin/x64/Debug/libLLVM.a" />\r
+                               </Linker>\r
+                       </Target>\r
+                       <Target title="Release x64">\r
+                               <Option output="./../../bin/x64/Release/libRAD.so.2" prefix_auto="0" extension_auto="0" />\r
+                               <Option object_output="obj/x64/Release/" />\r
+                               <Option type="3" />\r
+                               <Option compiler="gcc" />\r
+                               <Option createDefFile="1" />\r
+                               <Option createStaticLib="1" />\r
+                               <Compiler>\r
+                                       <Add option="-march=core2" />\r
+                                       <Add option="-fomit-frame-pointer" />\r
+                                       <Add option="-O2" />\r
+                                       <Add option="-m64" />\r
+                                       <Add option="-fPIC" />\r
+                                       <Add option="-ffunction-sections" />\r
+                                       <Add option="-fdata-sections" />\r
+                                       <Add option="-DNDEBUG" />\r
+                                       <Add option="-DANGLE_DISABLE_TRACE" />\r
+                               </Compiler>\r
+                               <Linker>\r
+                                       <Add option="-s" />\r
+                                       <Add option="-m64" />\r
+                                       <Add option="-Wl,--gc-sections" />\r
+                                       <Add library="./../../LLVM/bin/x64/Release/libLLVM.a" />\r
+                               </Linker>\r
+                       </Target>\r
+               </Build>\r
+               <Compiler>\r
+                       <Add option="-Wall" />\r
+                       <Add option="-fexceptions" />\r
+                       <Add option="-fno-operator-names" />\r
+                       <Add option="-ffriend-injection" />\r
+                       <Add option="-msse2" />\r
+                       <Add option="-D__STDC_LIMIT_MACROS" />\r
+                       <Add option="-D__STDC_CONSTANT_MACROS" />\r
+                       <Add directory="./../" />\r
+                       <Add directory="./../include/" />\r
+                       <Add directory="./../../" />\r
+                       <Add directory="./../../LLVM/include-linux/" />\r
+                       <Add directory="./../../LLVM/include/" />\r
+                       <Add directory="./../../LLVM/lib/Target/X86" />\r
+                       <Add directory="./../../Renderer/" />\r
+                       <Add directory="./../../Common/" />\r
+                       <Add directory="./../../Shader/" />\r
+                       <Add directory="./../../Main/" />\r
+               </Compiler>\r
+               <Linker>\r
+                       <Add option="-Wl,--version-script=./exports.map" />\r
+                       <Add library="pthread" />\r
+                       <Add library="X11" />\r
+                       <Add library="Xext" />\r
+               </Linker>\r
+               <Unit filename="./../../Common/CPUID.cpp" />\r
+               <Unit filename="./../../Common/CPUID.hpp" />\r
+               <Unit filename="./../../Common/Configurator.cpp" />\r
+               <Unit filename="./../../Common/Configurator.hpp" />\r
+               <Unit filename="./../../Common/Debug.cpp" />\r
+               <Unit filename="./../../Common/Debug.hpp" />\r
+               <Unit filename="./../../Common/ExceptionHandling.hpp" />\r
+               <Unit filename="./../../Common/Half.cpp" />\r
+               <Unit filename="./../../Common/Half.hpp" />\r
+               <Unit filename="./../../Common/Math.cpp" />\r
+               <Unit filename="./../../Common/Math.hpp" />\r
+               <Unit filename="./../../Common/Memory.cpp" />\r
+               <Unit filename="./../../Common/Memory.hpp" />\r
+               <Unit filename="./../../Common/MetaMacro.hpp" />\r
+               <Unit filename="./../../Common/MutexLock.hpp" />\r
+               <Unit filename="./../../Common/Resource.cpp" />\r
+               <Unit filename="./../../Common/Resource.hpp" />\r
+               <Unit filename="./../../Common/Socket.cpp" />\r
+               <Unit filename="./../../Common/Socket.hpp" />\r
+               <Unit filename="./../../Common/Thread.cpp" />\r
+               <Unit filename="./../../Common/Thread.hpp" />\r
+               <Unit filename="./../../Common/Timer.cpp" />\r
+               <Unit filename="./../../Common/Timer.hpp" />\r
+               <Unit filename="./../../Common/Types.hpp" />\r
+               <Unit filename="./../../Common/Version.h" />\r
+               <Unit filename="./../common/debug.cpp" />\r
+               <Unit filename="./../common/debug.h" />\r
+               <Unit filename="../compiler/AnalyzeCallDepth.cpp" />\r
+               <Unit filename="../compiler/AnalyzeCallDepth.h" />\r
+               <Unit filename="../compiler/BaseTypes.h" />\r
+               <Unit filename="../compiler/Common.h" />\r
+               <Unit filename="../compiler/Compiler.cpp" />\r
+               <Unit filename="../compiler/ConstantUnion.h" />\r
+               <Unit filename="../compiler/Diagnostics.cpp" />\r
+               <Unit filename="../compiler/Diagnostics.h" />\r
+               <Unit filename="../compiler/DirectiveHandler.cpp" />\r
+               <Unit filename="../compiler/DirectiveHandler.h" />\r
+               <Unit filename="../compiler/ExtensionBehavior.h" />\r
+               <Unit filename="../compiler/InfoSink.cpp" />\r
+               <Unit filename="../compiler/InfoSink.h" />\r
+               <Unit filename="../compiler/Initialize.cpp" />\r
+               <Unit filename="../compiler/Initialize.h" />\r
+               <Unit filename="../compiler/InitializeDll.cpp" />\r
+               <Unit filename="../compiler/InitializeDll.h" />\r
+               <Unit filename="../compiler/InitializeGlobals.h" />\r
+               <Unit filename="../compiler/InitializeParseContext.cpp" />\r
+               <Unit filename="../compiler/InitializeParseContext.h" />\r
+               <Unit filename="../compiler/IntermTraverse.cpp" />\r
+               <Unit filename="../compiler/Intermediate.cpp" />\r
+               <Unit filename="../compiler/MMap.h" />\r
+               <Unit filename="../compiler/OutputASM.cpp" />\r
+               <Unit filename="../compiler/OutputASM.h" />\r
+               <Unit filename="../compiler/ParseHelper.cpp" />\r
+               <Unit filename="../compiler/ParseHelper.h" />\r
+               <Unit filename="../compiler/PoolAlloc.cpp" />\r
+               <Unit filename="../compiler/PoolAlloc.h" />\r
+               <Unit filename="../compiler/Pragma.h" />\r
+               <Unit filename="../compiler/RemoveTree.cpp" />\r
+               <Unit filename="../compiler/RemoveTree.h" />\r
+               <Unit filename="../compiler/ShHandle.h" />\r
+               <Unit filename="../compiler/ShaderLang.cpp" />\r
+               <Unit filename="../compiler/SymbolTable.cpp" />\r
+               <Unit filename="../compiler/SymbolTable.h" />\r
+               <Unit filename="../compiler/TranslatorASM.cpp" />\r
+               <Unit filename="../compiler/TranslatorASM.h" />\r
+               <Unit filename="../compiler/Types.h" />\r
+               <Unit filename="../compiler/ValidateLimitations.cpp" />\r
+               <Unit filename="../compiler/ValidateLimitations.h" />\r
+               <Unit filename="../compiler/debug.cpp" />\r
+               <Unit filename="../compiler/debug.h" />\r
+               <Unit filename="../compiler/glslang.h" />\r
+               <Unit filename="../compiler/glslang_lex.cpp" />\r
+               <Unit filename="../compiler/glslang_tab.cpp" />\r
+               <Unit filename="../compiler/glslang_tab.h" />\r
+               <Unit filename="../compiler/intermOut.cpp" />\r
+               <Unit filename="../compiler/intermediate.h" />\r
+               <Unit filename="../compiler/localintermediate.h" />\r
+               <Unit filename="../compiler/osinclude.h" />\r
+               <Unit filename="../compiler/ossource_posix.cpp" />\r
+               <Unit filename="../compiler/parseConst.cpp" />\r
+               <Unit filename="../compiler/preprocessor/Diagnostics.cpp" />\r
+               <Unit filename="../compiler/preprocessor/Diagnostics.h" />\r
+               <Unit filename="../compiler/preprocessor/DirectiveHandler.cpp" />\r
+               <Unit filename="../compiler/preprocessor/DirectiveHandler.h" />\r
+               <Unit filename="../compiler/preprocessor/DirectiveParser.cpp" />\r
+               <Unit filename="../compiler/preprocessor/DirectiveParser.h" />\r
+               <Unit filename="../compiler/preprocessor/ExpressionParser.cpp" />\r
+               <Unit filename="../compiler/preprocessor/ExpressionParser.h" />\r
+               <Unit filename="../compiler/preprocessor/Input.cpp" />\r
+               <Unit filename="../compiler/preprocessor/Input.h" />\r
+               <Unit filename="../compiler/preprocessor/Lexer.cpp" />\r
+               <Unit filename="../compiler/preprocessor/Lexer.h" />\r
+               <Unit filename="../compiler/preprocessor/Macro.cpp" />\r
+               <Unit filename="../compiler/preprocessor/Macro.h" />\r
+               <Unit filename="../compiler/preprocessor/MacroExpander.cpp" />\r
+               <Unit filename="../compiler/preprocessor/MacroExpander.h" />\r
+               <Unit filename="../compiler/preprocessor/Preprocessor.cpp" />\r
+               <Unit filename="../compiler/preprocessor/Preprocessor.h" />\r
+               <Unit filename="../compiler/preprocessor/SourceLocation.h" />\r
+               <Unit filename="../compiler/preprocessor/Token.cpp" />\r
+               <Unit filename="../compiler/preprocessor/Token.h" />\r
+               <Unit filename="../compiler/preprocessor/Tokenizer.cpp" />\r
+               <Unit filename="../compiler/preprocessor/Tokenizer.h" />\r
+               <Unit filename="../compiler/preprocessor/length_limits.h" />\r
+               <Unit filename="../compiler/preprocessor/numeric_lex.h" />\r
+               <Unit filename="../compiler/preprocessor/pp_utils.h" />\r
+               <Unit filename="../compiler/util.cpp" />\r
+               <Unit filename="../compiler/util.h" />\r
+               <Unit filename="./../include/EGL/egl.h" />\r
+               <Unit filename="./../include/EGL/eglext.h" />\r
+               <Unit filename="./../include/EGL/eglplatform.h" />\r
+               <Unit filename="./../include/GLES2/gl2.h" />\r
+               <Unit filename="./../include/GLES2/gl2ext.h" />\r
+               <Unit filename="./../include/GLES2/gl2platform.h" />\r
+               <Unit filename="./../include/GLSLANG/ShaderLang.h" />\r
+               <Unit filename="./../include/KHR/khrplatform.h" />\r
+               <Unit filename="./../libRAD/Buffer.cpp" />\r
+               <Unit filename="./../libRAD/Buffer.h" />\r
+               <Unit filename="./../libRAD/Context.cpp" />\r
+               <Unit filename="./../libRAD/Context.h" />\r
+               <Unit filename="./../libRAD/Device.cpp" />\r
+               <Unit filename="./../libRAD/Device.hpp" />\r
+               <Unit filename="./../libRAD/Fence.cpp" />\r
+               <Unit filename="./../libRAD/Fence.h" />\r
+               <Unit filename="./../libRAD/Framebuffer.cpp" />\r
+               <Unit filename="./../libRAD/Framebuffer.h" />\r
+               <Unit filename="./../libRAD/HandleAllocator.cpp" />\r
+               <Unit filename="./../libRAD/HandleAllocator.h" />\r
+               <Unit filename="./../libRAD/Image.cpp" />\r
+               <Unit filename="./../libRAD/Image.hpp" />\r
+               <Unit filename="./../libRAD/IndexDataManager.cpp" />\r
+               <Unit filename="./../libRAD/IndexDataManager.h" />\r
+               <Unit filename="./../libRAD/Program.cpp" />\r
+               <Unit filename="./../libRAD/Program.h" />\r
+               <Unit filename="./../libRAD/Query.cpp" />\r
+               <Unit filename="./../libRAD/Query.h" />\r
+               <Unit filename="./../libRAD/RefCountObject.cpp" />\r
+               <Unit filename="./../libRAD/RefCountObject.h" />\r
+               <Unit filename="./../libRAD/Renderbuffer.cpp" />\r
+               <Unit filename="./../libRAD/Renderbuffer.h" />\r
+               <Unit filename="./../libRAD/ResourceManager.cpp" />\r
+               <Unit filename="./../libRAD/ResourceManager.h" />\r
+               <Unit filename="./../libRAD/Shader.cpp" />\r
+               <Unit filename="./../libRAD/Shader.h" />\r
+               <Unit filename="./../libRAD/Texture.cpp" />\r
+               <Unit filename="./../libRAD/Texture.h" />\r
+               <Unit filename="./../libRAD/Unknown.hpp" />\r
+               <Unit filename="./../libRAD/VertexDataManager.cpp" />\r
+               <Unit filename="./../libRAD/VertexDataManager.h" />\r
+               <Unit filename="./../libRAD/libRAD.cpp" />\r
+               <Unit filename="./../libRAD/main.cpp" />\r
+               <Unit filename="./../libRAD/main.h" />\r
+               <Unit filename="./../libRAD/mathutil.h" />\r
+               <Unit filename="./../libRAD/resource.h" />\r
+               <Unit filename="./../libRAD/utilities.cpp" />\r
+               <Unit filename="./../libRAD/utilities.h" />\r
+               <Unit filename="./../libRAD/vertexconversion.h" />\r
+               <Unit filename="./../../Main/Config.cpp" />\r
+               <Unit filename="./../../Main/Config.hpp" />\r
+               <Unit filename="./../../Main/FrameBuffer.cpp" />\r
+               <Unit filename="./../../Main/FrameBuffer.hpp" />\r
+               <Unit filename="./../../Main/FrameBufferX11.cpp" />\r
+               <Unit filename="./../../Main/FrameBufferX11.hpp" />\r
+               <Unit filename="./../../Main/Logo.cpp" />\r
+               <Unit filename="./../../Main/Register.cpp" />\r
+               <Unit filename="./../../Main/Register.hpp" />\r
+               <Unit filename="./../../Main/SwiftConfig.cpp" />\r
+               <Unit filename="./../../Main/SwiftConfig.hpp" />\r
+               <Unit filename="./../../Main/crc.c">\r
+                       <Option compilerVar="CC" />\r
+               </Unit>\r
+               <Unit filename="./../../Main/crc.h" />\r
+               <Unit filename="./../../Main/serialcommon.h" />\r
+               <Unit filename="./../../Main/serialvalid.cpp" />\r
+               <Unit filename="./../../Main/serialvalid.h" />\r
+               <Unit filename="./../../Reactor/Routine.cpp" />\r
+               <Unit filename="./../../Reactor/Routine.hpp" />\r
+               <Unit filename="./../../Reactor/RoutineManager.cpp" />\r
+               <Unit filename="./../../Reactor/RoutineManager.hpp" />\r
+               <Unit filename="./../../Reactor/Nucleus.cpp" />\r
+               <Unit filename="./../../Reactor/Nucleus.hpp" />\r
+               <Unit filename="./../../Reactor/Reactor.hpp" />\r
+               <Unit filename="./../../Reactor/x86.hpp" />\r
+               <Unit filename="./../../Renderer/Blitter.cpp" />\r
+               <Unit filename="./../../Renderer/Blitter.hpp" />\r
+               <Unit filename="./../../Renderer/Clipper.cpp" />\r
+               <Unit filename="./../../Renderer/Clipper.hpp" />\r
+               <Unit filename="./../../Renderer/Color.cpp" />\r
+               <Unit filename="./../../Renderer/Color.hpp" />\r
+               <Unit filename="./../../Renderer/Context.cpp" />\r
+               <Unit filename="./../../Renderer/Context.hpp" />\r
+               <Unit filename="./../../Renderer/LRUCache.hpp" />\r
+               <Unit filename="./../../Renderer/Matrix.cpp" />\r
+               <Unit filename="./../../Renderer/Matrix.hpp" />\r
+               <Unit filename="./../../Renderer/PixelProcessor.cpp" />\r
+               <Unit filename="./../../Renderer/PixelProcessor.hpp" />\r
+               <Unit filename="./../../Renderer/Plane.cpp" />\r
+               <Unit filename="./../../Renderer/Plane.hpp" />\r
+               <Unit filename="./../../Renderer/Point.cpp" />\r
+               <Unit filename="./../../Renderer/Point.hpp" />\r
+               <Unit filename="./../../Renderer/Polygon.hpp" />\r
+               <Unit filename="./../../Renderer/Primitive.hpp" />\r
+               <Unit filename="./../../Renderer/QuadRasterizer.cpp" />\r
+               <Unit filename="./../../Renderer/QuadRasterizer.hpp" />\r
+               <Unit filename="./../../Renderer/Rasterizer.cpp" />\r
+               <Unit filename="./../../Renderer/Rasterizer.hpp" />\r
+               <Unit filename="./../../Renderer/Renderer.cpp" />\r
+               <Unit filename="./../../Renderer/Renderer.hpp" />\r
+               <Unit filename="./../../Renderer/Sampler.cpp" />\r
+               <Unit filename="./../../Renderer/Sampler.hpp" />\r
+               <Unit filename="./../../Renderer/SetupProcessor.cpp" />\r
+               <Unit filename="./../../Renderer/SetupProcessor.hpp" />\r
+               <Unit filename="./../../Renderer/Stream.hpp" />\r
+               <Unit filename="./../../Renderer/Surface.cpp" />\r
+               <Unit filename="./../../Renderer/Surface.hpp" />\r
+               <Unit filename="./../../Renderer/TextureStage.cpp" />\r
+               <Unit filename="./../../Renderer/TextureStage.hpp" />\r
+               <Unit filename="./../../Renderer/Triangle.hpp" />\r
+               <Unit filename="./../../Renderer/Vector.cpp" />\r
+               <Unit filename="./../../Renderer/Vector.hpp" />\r
+               <Unit filename="./../../Renderer/Vertex.hpp" />\r
+               <Unit filename="./../../Renderer/VertexProcessor.cpp" />\r
+               <Unit filename="./../../Renderer/VertexProcessor.hpp" />\r
+               <Unit filename="./../../Shader/Constants.cpp" />\r
+               <Unit filename="./../../Shader/Constants.hpp" />\r
+               <Unit filename="./../../Shader/PixelRoutine.cpp" />\r
+               <Unit filename="./../../Shader/PixelRoutine.hpp" />\r
+               <Unit filename="./../../Shader/PixelShader.cpp" />\r
+               <Unit filename="./../../Shader/PixelShader.hpp" />\r
+               <Unit filename="./../../Shader/SamplerCore.cpp" />\r
+               <Unit filename="./../../Shader/SamplerCore.hpp" />\r
+               <Unit filename="./../../Shader/SetupRoutine.cpp" />\r
+               <Unit filename="./../../Shader/SetupRoutine.hpp" />\r
+               <Unit filename="./../../Shader/Shader.cpp" />\r
+               <Unit filename="./../../Shader/Shader.hpp" />\r
+               <Unit filename="./../../Shader/ShaderCore.cpp" />\r
+               <Unit filename="./../../Shader/ShaderCore.hpp" />\r
+               <Unit filename="./../../Shader/VertexPipeline.cpp" />\r
+               <Unit filename="./../../Shader/VertexPipeline.hpp" />\r
+               <Unit filename="./../../Shader/VertexProgram.cpp" />\r
+               <Unit filename="./../../Shader/VertexProgram.hpp" />\r
+               <Unit filename="./../../Shader/VertexRoutine.cpp" />\r
+               <Unit filename="./../../Shader/VertexRoutine.hpp" />\r
+               <Unit filename="./../../Shader/VertexShader.cpp" />\r
+               <Unit filename="./../../Shader/VertexShader.hpp" />\r
+               <Extensions>\r
+                       <code_completion />\r
+                       <debugger />\r
+               </Extensions>\r
+       </Project>\r
+</CodeBlocks_project_file>\r
similarity index 86%
rename from src/Radiance/libRAD/libGLESv2.cpp
rename to src/Radiance/libRAD/libRAD.cpp
index bef619c..8208b01 100644 (file)
@@ -8,7 +8,7 @@
 // agreement of TransGaming Inc. Without such an agreement, no rights or licenses, express\r
 // or implied, including but not limited to any patent rights, are granted to you.\r
 //\r
-// libGLESv2.cpp: Implements the exported OpenGL ES 2.0 functions.\r
+// libRAD.cpp: Implements the exported OpenGL ES 2.0 functions.\r
 \r
 #include "main.h"\r
 #include "mathutil.h"\r
@@ -35,7 +35,7 @@
 \r
 static bool validImageSize(GLint level, GLsizei width, GLsizei height)\r
 {\r
-    if(level < 0 || level >= es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS || width < 0 || height < 0)\r
+    if(level < 0 || level >= rad::IMPLEMENTATION_MAX_TEXTURE_LEVELS || width < 0 || height < 0)\r
     {\r
         return false;\r
     }\r
@@ -43,7 +43,7 @@ static bool validImageSize(GLint level, GLsizei width, GLsizei height)
     return true;\r
 }\r
 \r
-static bool validateSubImageParams(bool compressed, GLsizei width, GLsizei height, GLint xoffset, GLint yoffset, GLenum target, GLint level, GLenum format, es2::Texture *texture)\r
+static bool validateSubImageParams(bool compressed, GLsizei width, GLsizei height, GLint xoffset, GLint yoffset, GLenum target, GLint level, GLenum format, rad::Texture *texture)\r
 {\r
     if(!texture)\r
     {\r
@@ -103,10 +103,10 @@ static bool validReadFormatType(GLenum format, GLenum type)
             return false;\r
         }\r
         break;\r
-    case es2::IMPLEMENTATION_COLOR_READ_FORMAT:\r
+    case rad::IMPLEMENTATION_COLOR_READ_FORMAT:\r
         switch (type)\r
         {\r
-        case es2::IMPLEMENTATION_COLOR_READ_TYPE:\r
+        case rad::IMPLEMENTATION_COLOR_READ_TYPE:\r
             break;\r
         default:\r
             return false;\r
@@ -128,11 +128,11 @@ void GL_APIENTRY glActiveTexture(GLenum texture)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            if(texture < GL_TEXTURE0 || texture > GL_TEXTURE0 + es2::MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1)\r
+            if(texture < GL_TEXTURE0 || texture > GL_TEXTURE0 + rad::MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1)\r
             {\r
                 return error(GL_INVALID_ENUM);\r
             }\r
@@ -152,12 +152,12 @@ void GL_APIENTRY glAttachShader(GLuint program, GLuint shader)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *programObject = context->getProgram(program);\r
-            es2::Shader *shaderObject = context->getShader(shader);\r
+            rad::Program *programObject = context->getProgram(program);\r
+            rad::Shader *shaderObject = context->getShader(shader);\r
 \r
             if(!programObject)\r
             {\r
@@ -215,7 +215,7 @@ void GL_APIENTRY glBeginQueryEXT(GLenum target, GLuint id)
             return error(GL_INVALID_OPERATION);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -234,16 +234,16 @@ void GL_APIENTRY glBindAttribLocation(GLuint program, GLuint index, const GLchar
 \r
     try\r
     {\r
-        if(index >= es2::MAX_VERTEX_ATTRIBS)\r
+        if(index >= rad::MAX_VERTEX_ATTRIBS)\r
         {\r
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(!programObject)\r
             {\r
@@ -277,7 +277,7 @@ void GL_APIENTRY glBindBuffer(GLenum target, GLuint buffer)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -311,7 +311,7 @@ void GL_APIENTRY glBindFramebuffer(GLenum target, GLuint framebuffer)
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -343,7 +343,7 @@ void GL_APIENTRY glBindRenderbuffer(GLenum target, GLuint renderbuffer)
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -362,11 +362,11 @@ void GL_APIENTRY glBindTexture(GLenum target, GLuint texture)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Texture *textureObject = context->getTexture(texture);\r
+            rad::Texture *textureObject = context->getTexture(texture);\r
 \r
             if(textureObject && textureObject->getTarget() != target && texture != 0)\r
             {\r
@@ -402,11 +402,11 @@ void GL_APIENTRY glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLcla
 \r
     try\r
     {\r
-        es2::Context* context = es2::getContext();\r
+        rad::Context* context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            context->setBlendColor(es2::clamp01(red), es2::clamp01(green), es2::clamp01(blue), es2::clamp01(alpha));\r
+            context->setBlendColor(rad::clamp01(red), rad::clamp01(green), rad::clamp01(blue), rad::clamp01(alpha));\r
         }\r
     }\r
     catch(std::bad_alloc&)\r
@@ -450,7 +450,7 @@ void GL_APIENTRY glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -561,7 +561,7 @@ void GL_APIENTRY glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlp
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -596,11 +596,11 @@ void GL_APIENTRY glBufferData(GLenum target, GLsizeiptr size, const GLvoid* data
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Buffer *buffer;\r
+            rad::Buffer *buffer;\r
 \r
             switch(target)\r
             {\r
@@ -645,11 +645,11 @@ void GL_APIENTRY glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Buffer *buffer;\r
+            rad::Buffer *buffer;\r
 \r
             switch(target)\r
             {\r
@@ -693,11 +693,11 @@ GLenum GL_APIENTRY glCheckFramebufferStatus(GLenum target)
             return error(GL_INVALID_ENUM, 0);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Framebuffer *framebuffer = NULL;\r
+            rad::Framebuffer *framebuffer = NULL;\r
             if(target == GL_READ_FRAMEBUFFER_ANGLE)\r
             {\r
                 framebuffer = context->getReadFramebuffer();\r
@@ -729,7 +729,7 @@ void GL_APIENTRY glClear(GLbitfield mask)
                        return error(GL_INVALID_VALUE);\r
                }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -749,7 +749,7 @@ void GL_APIENTRY glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLcla
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -768,7 +768,7 @@ void GL_APIENTRY glClearDepthf(GLclampf depth)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -787,7 +787,7 @@ void GL_APIENTRY glClearStencil(GLint s)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -807,7 +807,7 @@ void GL_APIENTRY glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLb
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -826,11 +826,11 @@ void GL_APIENTRY glCompileShader(GLuint shader)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Shader *shaderObject = context->getShader(shader);\r
+            rad::Shader *shaderObject = context->getShader(shader);\r
 \r
             if(!shaderObject)\r
             {\r
@@ -893,11 +893,11 @@ void GL_APIENTRY glCompressedTexImage2D(GLenum target, GLint level, GLenum inter
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-                       if(level > es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS)\r
+                       if(level > rad::IMPLEMENTATION_MAX_TEXTURE_LEVELS)\r
             {\r
                 return error(GL_INVALID_VALUE);\r
             }\r
@@ -905,8 +905,8 @@ void GL_APIENTRY glCompressedTexImage2D(GLenum target, GLint level, GLenum inter
             switch(target)\r
             {\r
               case GL_TEXTURE_2D:\r
-                if(width > (es2::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level) ||\r
-                    height > (es2::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level))\r
+                if(width > (rad::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level) ||\r
+                    height > (rad::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level))\r
                 {\r
                     return error(GL_INVALID_VALUE);\r
                 }\r
@@ -922,8 +922,8 @@ void GL_APIENTRY glCompressedTexImage2D(GLenum target, GLint level, GLenum inter
                     return error(GL_INVALID_VALUE);\r
                 }\r
 \r
-                if(width > (es2::IMPLEMENTATION_MAX_CUBE_MAP_TEXTURE_SIZE >> level) ||\r
-                   height > (es2::IMPLEMENTATION_MAX_CUBE_MAP_TEXTURE_SIZE >> level))\r
+                if(width > (rad::IMPLEMENTATION_MAX_CUBE_MAP_TEXTURE_SIZE >> level) ||\r
+                   height > (rad::IMPLEMENTATION_MAX_CUBE_MAP_TEXTURE_SIZE >> level))\r
                 {\r
                     return error(GL_INVALID_VALUE);\r
                 }\r
@@ -932,14 +932,14 @@ void GL_APIENTRY glCompressedTexImage2D(GLenum target, GLint level, GLenum inter
                 return error(GL_INVALID_ENUM);\r
             }\r
 \r
-            if(imageSize != es2::ComputeCompressedSize(width, height, internalformat))\r
+            if(imageSize != rad::ComputeCompressedSize(width, height, internalformat))\r
             {\r
                 return error(GL_INVALID_VALUE);\r
             }\r
 \r
             if(target == GL_TEXTURE_2D)\r
             {\r
-                es2::Texture2D *texture = context->getTexture2D();\r
+                rad::Texture2D *texture = context->getTexture2D();\r
 \r
                 if(!texture)\r
                 {\r
@@ -950,7 +950,7 @@ void GL_APIENTRY glCompressedTexImage2D(GLenum target, GLint level, GLenum inter
             }\r
             else\r
             {\r
-                es2::TextureCubeMap *texture = context->getTextureCubeMap();\r
+                rad::TextureCubeMap *texture = context->getTextureCubeMap();\r
 \r
                 if(!texture)\r
                 {\r
@@ -988,7 +988,7 @@ void GL_APIENTRY glCompressedTexSubImage2D(GLenum target, GLint level, GLint xof
 \r
     try\r
     {\r
-        if(!es2::IsTextureTarget(target))\r
+        if(!rad::IsTextureTarget(target))\r
         {\r
             return error(GL_INVALID_ENUM);\r
         }\r
@@ -1018,16 +1018,16 @@ void GL_APIENTRY glCompressedTexSubImage2D(GLenum target, GLint level, GLint xof
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            if(level > es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS)\r
+            if(level > rad::IMPLEMENTATION_MAX_TEXTURE_LEVELS)\r
             {\r
                 return error(GL_INVALID_VALUE);\r
             }\r
 \r
-            if(imageSize != es2::ComputeCompressedSize(width, height, format))\r
+            if(imageSize != rad::ComputeCompressedSize(width, height, format))\r
             {\r
                 return error(GL_INVALID_VALUE);\r
             }\r
@@ -1040,16 +1040,16 @@ void GL_APIENTRY glCompressedTexSubImage2D(GLenum target, GLint level, GLint xof
 \r
             if(target == GL_TEXTURE_2D)\r
             {\r
-                es2::Texture2D *texture = context->getTexture2D();\r
+                rad::Texture2D *texture = context->getTexture2D();\r
 \r
                 if(validateSubImageParams(true, width, height, xoffset, yoffset, target, level, format, texture))\r
                                {\r
                                        texture->subImageCompressed(level, xoffset, yoffset, width, height, format, imageSize, data);\r
                                }\r
             }\r
-            else if(es2::IsCubemapTextureTarget(target))\r
+            else if(rad::IsCubemapTextureTarget(target))\r
             {\r
-                es2::TextureCubeMap *texture = context->getTextureCubeMap();\r
+                rad::TextureCubeMap *texture = context->getTextureCubeMap();\r
 \r
                 if(validateSubImageParams(true, width, height, xoffset, yoffset, target, level, format, texture))\r
                                {\r
@@ -1086,15 +1086,15 @@ void GL_APIENTRY glCopyTexImage2D(GLenum target, GLint level, GLenum internalfor
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
             switch(target)\r
             {\r
               case GL_TEXTURE_2D:\r
-                if(width > (es2::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level) ||\r
-                   height > (es2::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level))\r
+                if(width > (rad::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level) ||\r
+                   height > (rad::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level))\r
                 {\r
                     return error(GL_INVALID_VALUE);\r
                 }\r
@@ -1110,8 +1110,8 @@ void GL_APIENTRY glCopyTexImage2D(GLenum target, GLint level, GLenum internalfor
                     return error(GL_INVALID_VALUE);\r
                 }\r
 \r
-                if(width > (es2::IMPLEMENTATION_MAX_CUBE_MAP_TEXTURE_SIZE >> level) ||\r
-                   height > (es2::IMPLEMENTATION_MAX_CUBE_MAP_TEXTURE_SIZE >> level))\r
+                if(width > (rad::IMPLEMENTATION_MAX_CUBE_MAP_TEXTURE_SIZE >> level) ||\r
+                   height > (rad::IMPLEMENTATION_MAX_CUBE_MAP_TEXTURE_SIZE >> level))\r
                 {\r
                     return error(GL_INVALID_VALUE);\r
                 }\r
@@ -1120,7 +1120,7 @@ void GL_APIENTRY glCopyTexImage2D(GLenum target, GLint level, GLenum internalfor
                 return error(GL_INVALID_ENUM);\r
             }\r
 \r
-            es2::Framebuffer *framebuffer = context->getReadFramebuffer();\r
+            rad::Framebuffer *framebuffer = context->getReadFramebuffer();\r
 \r
             if(framebuffer->completeness() != GL_FRAMEBUFFER_COMPLETE)\r
             {\r
@@ -1132,7 +1132,7 @@ void GL_APIENTRY glCopyTexImage2D(GLenum target, GLint level, GLenum internalfor
                 return error(GL_INVALID_OPERATION);\r
             }\r
 \r
-            es2::Renderbuffer *source = framebuffer->getColorbuffer();\r
+            rad::Renderbuffer *source = framebuffer->getColorbuffer();\r
             GLenum colorbufferFormat = source->getFormat();\r
 \r
             // [OpenGL ES 2.0.24] table 3.9\r
@@ -1190,7 +1190,7 @@ void GL_APIENTRY glCopyTexImage2D(GLenum target, GLint level, GLenum internalfor
 \r
             if(target == GL_TEXTURE_2D)\r
             {\r
-                es2::Texture2D *texture = context->getTexture2D();\r
+                rad::Texture2D *texture = context->getTexture2D();\r
 \r
                 if(!texture)\r
                 {\r
@@ -1199,9 +1199,9 @@ void GL_APIENTRY glCopyTexImage2D(GLenum target, GLint level, GLenum internalfor
 \r
                 texture->copyImage(level, internalformat, x, y, width, height, framebuffer);\r
             }\r
-            else if(es2::IsCubemapTextureTarget(target))\r
+            else if(rad::IsCubemapTextureTarget(target))\r
             {\r
-                es2::TextureCubeMap *texture = context->getTextureCubeMap();\r
+                rad::TextureCubeMap *texture = context->getTextureCubeMap();\r
 \r
                 if(!texture)\r
                 {\r
@@ -1227,7 +1227,7 @@ void GL_APIENTRY glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset,
 \r
     try\r
     {\r
-        if(!es2::IsTextureTarget(target))\r
+        if(!rad::IsTextureTarget(target))\r
         {\r
             return error(GL_INVALID_ENUM);\r
         }\r
@@ -1247,16 +1247,16 @@ void GL_APIENTRY glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset,
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            if(level > es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS)\r
+            if(level > rad::IMPLEMENTATION_MAX_TEXTURE_LEVELS)\r
             {\r
                 return error(GL_INVALID_VALUE);\r
             }\r
 \r
-            es2::Framebuffer *framebuffer = context->getReadFramebuffer();\r
+            rad::Framebuffer *framebuffer = context->getReadFramebuffer();\r
 \r
             if(framebuffer->completeness() != GL_FRAMEBUFFER_COMPLETE)\r
             {\r
@@ -1268,15 +1268,15 @@ void GL_APIENTRY glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset,
                 return error(GL_INVALID_OPERATION);\r
             }\r
 \r
-            es2::Renderbuffer *source = framebuffer->getColorbuffer();\r
+            rad::Renderbuffer *source = framebuffer->getColorbuffer();\r
             GLenum colorbufferFormat = source->getFormat();\r
-            es2::Texture *texture = NULL;\r
+            rad::Texture *texture = NULL;\r
 \r
             if(target == GL_TEXTURE_2D)\r
             {\r
                 texture = context->getTexture2D();\r
             }\r
-            else if(es2::IsCubemapTextureTarget(target))\r
+            else if(rad::IsCubemapTextureTarget(target))\r
             {\r
                 texture = context->getTextureCubeMap();\r
             }\r
@@ -1353,7 +1353,7 @@ GLuint GL_APIENTRY glCreateProgram(void)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1374,7 +1374,7 @@ GLuint GL_APIENTRY glCreateShader(GLenum type)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1408,7 +1408,7 @@ void GL_APIENTRY glCullFace(GLenum mode)
           case GL_BACK:\r
           case GL_FRONT_AND_BACK:\r
             {\r
-                es2::Context *context = es2::getContext();\r
+                rad::Context *context = rad::getContext();\r
 \r
                 if(context)\r
                 {\r
@@ -1437,7 +1437,7 @@ void GL_APIENTRY glDeleteBuffers(GLsizei n, const GLuint* buffers)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1464,7 +1464,7 @@ void GL_APIENTRY glDeleteFencesNV(GLsizei n, const GLuint* fences)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1491,7 +1491,7 @@ void GL_APIENTRY glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1521,7 +1521,7 @@ void GL_APIENTRY glDeleteProgram(GLuint program)
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1557,7 +1557,7 @@ void GL_APIENTRY glDeleteQueriesEXT(GLsizei n, const GLuint *ids)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1584,7 +1584,7 @@ void GL_APIENTRY glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1611,7 +1611,7 @@ void GL_APIENTRY glDeleteShader(GLuint shader)
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1647,7 +1647,7 @@ void GL_APIENTRY glDeleteTextures(GLsizei n, const GLuint* textures)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1687,7 +1687,7 @@ void GL_APIENTRY glDepthFunc(GLenum func)
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1706,7 +1706,7 @@ void GL_APIENTRY glDepthMask(GLboolean flag)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1725,7 +1725,7 @@ void GL_APIENTRY glDepthRangef(GLclampf zNear, GLclampf zFar)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1744,17 +1744,17 @@ void GL_APIENTRY glDetachShader(GLuint program, GLuint shader)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
 \r
-            es2::Program *programObject = context->getProgram(program);\r
-            es2::Shader *shaderObject = context->getShader(shader);\r
+            rad::Program *programObject = context->getProgram(program);\r
+            rad::Shader *shaderObject = context->getShader(shader);\r
             \r
             if(!programObject)\r
             {\r
-                es2::Shader *shaderByProgramHandle;\r
+                rad::Shader *shaderByProgramHandle;\r
                 shaderByProgramHandle = context->getShader(program);\r
                 if(!shaderByProgramHandle)\r
                 {\r
@@ -1768,7 +1768,7 @@ void GL_APIENTRY glDetachShader(GLuint program, GLuint shader)
 \r
             if(!shaderObject)\r
             {\r
-                es2::Program *programByShaderHandle = context->getProgram(shader);\r
+                rad::Program *programByShaderHandle = context->getProgram(shader);\r
                 if(!programByShaderHandle)\r
                 {\r
                     return error(GL_INVALID_VALUE);\r
@@ -1797,7 +1797,7 @@ void GL_APIENTRY glDisable(GLenum cap)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1829,12 +1829,12 @@ void GL_APIENTRY glDisableVertexAttribArray(GLuint index)
 \r
     try\r
     {\r
-        if(index >= es2::MAX_VERTEX_ATTRIBS)\r
+        if(index >= rad::MAX_VERTEX_ATTRIBS)\r
         {\r
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1858,7 +1858,7 @@ void GL_APIENTRY glDrawArrays(GLenum mode, GLint first, GLsizei count)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1883,7 +1883,7 @@ void GL_APIENTRY glDrawElements(GLenum mode, GLsizei count, GLenum type, const G
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1912,7 +1912,7 @@ void GL_APIENTRY glEnable(GLenum cap)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1944,12 +1944,12 @@ void GL_APIENTRY glEnableVertexAttribArray(GLuint index)
 \r
     try\r
     {\r
-        if(index >= es2::MAX_VERTEX_ATTRIBS)\r
+        if(index >= rad::MAX_VERTEX_ATTRIBS)\r
         {\r
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1977,7 +1977,7 @@ void GL_APIENTRY glEndQueryEXT(GLenum target)
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -1996,11 +1996,11 @@ void GL_APIENTRY glFinishFenceNV(GLuint fence)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Fence* fenceObject = context->getFence(fence);\r
+            rad::Fence* fenceObject = context->getFence(fence);\r
 \r
             if(fenceObject == NULL)\r
             {\r
@@ -2022,7 +2022,7 @@ void GL_APIENTRY glFinish(void)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -2041,7 +2041,7 @@ void GL_APIENTRY glFlush(void)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -2067,11 +2067,11 @@ void GL_APIENTRY glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLe
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Framebuffer *framebuffer = NULL;\r
+            rad::Framebuffer *framebuffer = NULL;\r
             GLuint framebufferHandle = 0;\r
             if(target == GL_READ_FRAMEBUFFER_ANGLE)\r
             {\r
@@ -2133,7 +2133,7 @@ void GL_APIENTRY glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -2143,7 +2143,7 @@ void GL_APIENTRY glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum
             }\r
             else\r
             {\r
-                es2::Texture *tex = context->getTexture(texture);\r
+                rad::Texture *tex = context->getTexture(texture);\r
 \r
                 if(tex == NULL)\r
                 {\r
@@ -2186,7 +2186,7 @@ void GL_APIENTRY glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum
                 }\r
             }\r
 \r
-            es2::Framebuffer *framebuffer = NULL;\r
+            rad::Framebuffer *framebuffer = NULL;\r
             GLuint framebufferHandle = 0;\r
             if(target == GL_READ_FRAMEBUFFER_ANGLE)\r
             {\r
@@ -2229,7 +2229,7 @@ void GL_APIENTRY glFrontFace(GLenum mode)
           case GL_CW:\r
           case GL_CCW:\r
             {\r
-                es2::Context *context = es2::getContext();\r
+                rad::Context *context = rad::getContext();\r
 \r
                 if(context)\r
                 {\r
@@ -2258,7 +2258,7 @@ void GL_APIENTRY glGenBuffers(GLsizei n, GLuint* buffers)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -2280,11 +2280,11 @@ void GL_APIENTRY glGenerateMipmap(GLenum target)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Texture *texture;\r
+            rad::Texture *texture;\r
 \r
             switch(target)\r
             {\r
@@ -2323,7 +2323,7 @@ void GL_APIENTRY glGenFencesNV(GLsizei n, GLuint* fences)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -2350,7 +2350,7 @@ void GL_APIENTRY glGenFramebuffers(GLsizei n, GLuint* framebuffers)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -2377,7 +2377,7 @@ void GL_APIENTRY glGenQueriesEXT(GLsizei n, GLuint* ids)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -2404,7 +2404,7 @@ void GL_APIENTRY glGenRenderbuffers(GLsizei n, GLuint* renderbuffers)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -2431,7 +2431,7 @@ void GL_APIENTRY glGenTextures(GLsizei n, GLuint* textures)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -2460,11 +2460,11 @@ void GL_APIENTRY glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(!programObject)\r
             {\r
@@ -2505,11 +2505,11 @@ void GL_APIENTRY glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsiz
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(!programObject)\r
             {\r
@@ -2549,11 +2549,11 @@ void GL_APIENTRY glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei*
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(!programObject)\r
             {\r
@@ -2582,12 +2582,12 @@ int GL_APIENTRY glGetAttribLocation(GLuint program, const GLchar* name)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
 \r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(!programObject)\r
             {\r
@@ -2623,7 +2623,7 @@ void GL_APIENTRY glGetBooleanv(GLenum pname, GLboolean* params)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -2686,11 +2686,11 @@ void GL_APIENTRY glGetBufferParameteriv(GLenum target, GLenum pname, GLint* para
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Buffer *buffer;\r
+            rad::Buffer *buffer;\r
 \r
             switch(target)\r
             {\r
@@ -2731,7 +2731,7 @@ GLenum GL_APIENTRY glGetError(void)
 {\r
     TRACE("()");\r
 \r
-    es2::Context *context = es2::getContext();\r
+    rad::Context *context = rad::getContext();\r
 \r
     if(context)\r
     {\r
@@ -2747,11 +2747,11 @@ void GL_APIENTRY glGetFenceivNV(GLuint fence, GLenum pname, GLint *params)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Fence *fenceObject = context->getFence(fence);\r
+            rad::Fence *fenceObject = context->getFence(fence);\r
 \r
             if(fenceObject == NULL)\r
             {\r
@@ -2773,7 +2773,7 @@ void GL_APIENTRY glGetFloatv(GLenum pname, GLfloat* params)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -2834,7 +2834,7 @@ void GL_APIENTRY glGetFramebufferAttachmentParameteriv(GLenum target, GLenum att
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -2843,7 +2843,7 @@ void GL_APIENTRY glGetFramebufferAttachmentParameteriv(GLenum target, GLenum att
                 return error(GL_INVALID_ENUM);\r
             }\r
 \r
-            es2::Framebuffer *framebuffer = NULL;\r
+            rad::Framebuffer *framebuffer = NULL;\r
             if(target == GL_READ_FRAMEBUFFER_ANGLE)\r
             {\r
                 if(context->getReadFramebufferHandle() == 0)\r
@@ -2887,7 +2887,7 @@ void GL_APIENTRY glGetFramebufferAttachmentParameteriv(GLenum target, GLenum att
             {\r
                 attachmentObjectType = attachmentType;\r
             }\r
-            else if(es2::IsTextureTarget(attachmentType))\r
+            else if(rad::IsTextureTarget(attachmentType))\r
             {\r
                 attachmentObjectType = GL_TEXTURE;\r
             }\r
@@ -2921,7 +2921,7 @@ void GL_APIENTRY glGetFramebufferAttachmentParameteriv(GLenum target, GLenum att
               case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE:\r
                 if(attachmentObjectType == GL_TEXTURE)\r
                 {\r
-                    if(es2::IsCubemapTextureTarget(attachmentType))\r
+                    if(rad::IsCubemapTextureTarget(attachmentType))\r
                     {\r
                         *params = attachmentType;\r
                     }\r
@@ -2959,7 +2959,7 @@ void GL_APIENTRY glGetIntegerv(GLenum pname, GLint* params)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -3024,11 +3024,11 @@ void GL_APIENTRY glGetProgramiv(GLuint program, GLenum pname, GLint* params)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(!programObject)\r
             {\r
@@ -3087,11 +3087,11 @@ void GL_APIENTRY glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* l
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(!programObject)\r
             {\r
@@ -3121,7 +3121,7 @@ void GL_APIENTRY glGetQueryivEXT(GLenum target, GLenum pname, GLint *params)
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -3149,11 +3149,11 @@ void GL_APIENTRY glGetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint *params)
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Query *queryObject = context->getQuery(id, false, GL_NONE);\r
+            rad::Query *queryObject = context->getQuery(id, false, GL_NONE);\r
 \r
             if(!queryObject)\r
             {\r
@@ -3190,7 +3190,7 @@ void GL_APIENTRY glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -3204,7 +3204,7 @@ void GL_APIENTRY glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint
                 return error(GL_INVALID_OPERATION);\r
             }\r
 \r
-            es2::Renderbuffer *renderbuffer = context->getRenderbuffer(context->getRenderbufferHandle());\r
+            rad::Renderbuffer *renderbuffer = context->getRenderbuffer(context->getRenderbufferHandle());\r
 \r
             switch(pname)\r
             {\r
@@ -3235,11 +3235,11 @@ void GL_APIENTRY glGetShaderiv(GLuint shader, GLenum pname, GLint* params)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Shader *shaderObject = context->getShader(shader);\r
+            rad::Shader *shaderObject = context->getShader(shader);\r
 \r
             if(!shaderObject)\r
             {\r
@@ -3286,11 +3286,11 @@ void GL_APIENTRY glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* len
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Shader *shaderObject = context->getShader(shader);\r
+            rad::Shader *shaderObject = context->getShader(shader);\r
 \r
             if(!shaderObject)\r
             {\r
@@ -3362,11 +3362,11 @@ void GL_APIENTRY glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* leng
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Shader *shaderObject = context->getShader(shader);\r
+            rad::Shader *shaderObject = context->getShader(shader);\r
 \r
             if(!shaderObject)\r
             {\r
@@ -3388,7 +3388,7 @@ const GLubyte* GL_APIENTRY glGetString(GLenum name)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         switch(name)\r
         {\r
@@ -3450,11 +3450,11 @@ void GL_APIENTRY glGetTexParameterfv(GLenum target, GLenum pname, GLfloat* param
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Texture *texture;\r
+            rad::Texture *texture;\r
 \r
             switch(target)\r
             {\r
@@ -3508,11 +3508,11 @@ void GL_APIENTRY glGetTexParameteriv(GLenum target, GLenum pname, GLint* params)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Texture *texture;\r
+            rad::Texture *texture;\r
 \r
             switch(target)\r
             {\r
@@ -3572,7 +3572,7 @@ void GL_APIENTRY glGetnUniformfvEXT(GLuint program, GLint location, GLsizei bufS
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -3581,7 +3581,7 @@ void GL_APIENTRY glGetnUniformfvEXT(GLuint program, GLint location, GLsizei bufS
                 return error(GL_INVALID_VALUE);\r
             }\r
 \r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(!programObject || !programObject->isLinked())\r
             {\r
@@ -3606,7 +3606,7 @@ void GL_APIENTRY glGetUniformfv(GLuint program, GLint location, GLfloat* params)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -3615,7 +3615,7 @@ void GL_APIENTRY glGetUniformfv(GLuint program, GLint location, GLfloat* params)
                 return error(GL_INVALID_VALUE);\r
             }\r
 \r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(!programObject || !programObject->isLinked())\r
             {\r
@@ -3646,7 +3646,7 @@ void GL_APIENTRY glGetnUniformivEXT(GLuint program, GLint location, GLsizei bufS
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -3655,7 +3655,7 @@ void GL_APIENTRY glGetnUniformivEXT(GLuint program, GLint location, GLsizei bufS
                 return error(GL_INVALID_VALUE);\r
             }\r
 \r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(!programObject || !programObject->isLinked())\r
             {\r
@@ -3685,7 +3685,7 @@ void GL_APIENTRY glGetUniformiv(GLuint program, GLint location, GLint* params)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -3694,7 +3694,7 @@ void GL_APIENTRY glGetUniformiv(GLuint program, GLint location, GLint* params)
                 return error(GL_INVALID_VALUE);\r
             }\r
 \r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(!programObject || !programObject->isLinked())\r
             {\r
@@ -3724,7 +3724,7 @@ int GL_APIENTRY glGetUniformLocation(GLuint program, const GLchar* name)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(strstr(name, "gl_") == name)\r
         {\r
@@ -3733,7 +3733,7 @@ int GL_APIENTRY glGetUniformLocation(GLuint program, const GLchar* name)
 \r
         if(context)\r
         {\r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(!programObject)\r
             {\r
@@ -3769,16 +3769,16 @@ void GL_APIENTRY glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            if(index >= es2::MAX_VERTEX_ATTRIBS)\r
+            if(index >= rad::MAX_VERTEX_ATTRIBS)\r
             {\r
                 return error(GL_INVALID_VALUE);\r
             }\r
 \r
-            const es2::VertexAttribute &attribState = context->getVertexAttribState(index);\r
+            const rad::VertexAttribute &attribState = context->getVertexAttribState(index);\r
 \r
             switch(pname)\r
             {\r
@@ -3822,16 +3822,16 @@ void GL_APIENTRY glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            if(index >= es2::MAX_VERTEX_ATTRIBS)\r
+            if(index >= rad::MAX_VERTEX_ATTRIBS)\r
             {\r
                 return error(GL_INVALID_VALUE);\r
             }\r
 \r
-            const es2::VertexAttribute &attribState = context->getVertexAttribState(index);\r
+            const rad::VertexAttribute &attribState = context->getVertexAttribState(index);\r
 \r
             switch(pname)\r
             {\r
@@ -3876,11 +3876,11 @@ void GL_APIENTRY glGetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid**
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            if(index >= es2::MAX_VERTEX_ATTRIBS)\r
+            if(index >= rad::MAX_VERTEX_ATTRIBS)\r
             {\r
                 return error(GL_INVALID_VALUE);\r
             }\r
@@ -3915,7 +3915,7 @@ void GL_APIENTRY glHint(GLenum target, GLenum mode)
             return error(GL_INVALID_ENUM); \r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
         switch(target)\r
         {\r
           case GL_GENERATE_MIPMAP_HINT:\r
@@ -3940,11 +3940,11 @@ GLboolean GL_APIENTRY glIsBuffer(GLuint buffer)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context && buffer)\r
         {\r
-            es2::Buffer *bufferObject = context->getBuffer(buffer);\r
+            rad::Buffer *bufferObject = context->getBuffer(buffer);\r
 \r
             if(bufferObject)\r
             {\r
@@ -3966,7 +3966,7 @@ GLboolean GL_APIENTRY glIsEnabled(GLenum cap)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -4000,11 +4000,11 @@ GLboolean GL_APIENTRY glIsFenceNV(GLuint fence)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Fence *fenceObject = context->getFence(fence);\r
+            rad::Fence *fenceObject = context->getFence(fence);\r
 \r
             if(fenceObject == NULL)\r
             {\r
@@ -4028,11 +4028,11 @@ GLboolean GL_APIENTRY glIsFramebuffer(GLuint framebuffer)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context && framebuffer)\r
         {\r
-            es2::Framebuffer *framebufferObject = context->getFramebuffer(framebuffer);\r
+            rad::Framebuffer *framebufferObject = context->getFramebuffer(framebuffer);\r
 \r
             if(framebufferObject)\r
             {\r
@@ -4054,11 +4054,11 @@ GLboolean GL_APIENTRY glIsProgram(GLuint program)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context && program)\r
         {\r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(programObject)\r
             {\r
@@ -4085,11 +4085,11 @@ GLboolean GL_APIENTRY glIsQueryEXT(GLuint id)
             return GL_FALSE;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Query *queryObject = context->getQuery(id, false, GL_NONE);\r
+            rad::Query *queryObject = context->getQuery(id, false, GL_NONE);\r
 \r
             if(queryObject)\r
             {\r
@@ -4111,11 +4111,11 @@ GLboolean GL_APIENTRY glIsRenderbuffer(GLuint renderbuffer)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context && renderbuffer)\r
         {\r
-            es2::Renderbuffer *renderbufferObject = context->getRenderbuffer(renderbuffer);\r
+            rad::Renderbuffer *renderbufferObject = context->getRenderbuffer(renderbuffer);\r
 \r
             if(renderbufferObject)\r
             {\r
@@ -4137,11 +4137,11 @@ GLboolean GL_APIENTRY glIsShader(GLuint shader)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context && shader)\r
         {\r
-            es2::Shader *shaderObject = context->getShader(shader);\r
+            rad::Shader *shaderObject = context->getShader(shader);\r
 \r
             if(shaderObject)\r
             {\r
@@ -4163,11 +4163,11 @@ GLboolean GL_APIENTRY glIsTexture(GLuint texture)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context && texture)\r
         {\r
-            es2::Texture *textureObject = context->getTexture(texture);\r
+            rad::Texture *textureObject = context->getTexture(texture);\r
 \r
             if(textureObject)\r
             {\r
@@ -4194,7 +4194,7 @@ void GL_APIENTRY glLineWidth(GLfloat width)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -4213,11 +4213,11 @@ void GL_APIENTRY glLinkProgram(GLuint program)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(!programObject)\r
             {\r
@@ -4246,7 +4246,7 @@ void GL_APIENTRY glPixelStorei(GLenum pname, GLint param)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -4287,7 +4287,7 @@ void GL_APIENTRY glPolygonOffset(GLfloat factor, GLfloat units)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -4320,7 +4320,7 @@ void GL_APIENTRY glReadnPixelsEXT(GLint x, GLint y, GLsizei width, GLsizei heigh
             return error(GL_INVALID_OPERATION);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -4351,7 +4351,7 @@ void GL_APIENTRY glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, G
             return error(GL_INVALID_OPERATION);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -4370,7 +4370,7 @@ void GL_APIENTRY glReleaseShaderCompiler(void)
 \r
     try\r
     {\r
-        es2::Shader::releaseCompiler();\r
+        rad::Shader::releaseCompiler();\r
     }\r
     catch(std::bad_alloc&)\r
     {\r
@@ -4393,7 +4393,7 @@ void GL_APIENTRY glRenderbufferStorageMultisampleANGLE(GLenum target, GLsizei sa
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        if(!es2::IsColorRenderable(internalformat) && !es2::IsDepthRenderable(internalformat) && !es2::IsStencilRenderable(internalformat))\r
+        if(!rad::IsColorRenderable(internalformat) && !rad::IsDepthRenderable(internalformat) && !rad::IsStencilRenderable(internalformat))\r
         {\r
             return error(GL_INVALID_ENUM);\r
         }\r
@@ -4403,13 +4403,13 @@ void GL_APIENTRY glRenderbufferStorageMultisampleANGLE(GLenum target, GLsizei sa
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            if(width > es2::IMPLEMENTATION_MAX_RENDERBUFFER_SIZE || \r
-               height > es2::IMPLEMENTATION_MAX_RENDERBUFFER_SIZE ||\r
-               samples > es2::IMPLEMENTATION_MAX_SAMPLES)\r
+            if(width > rad::IMPLEMENTATION_MAX_RENDERBUFFER_SIZE || \r
+               height > rad::IMPLEMENTATION_MAX_RENDERBUFFER_SIZE ||\r
+               samples > rad::IMPLEMENTATION_MAX_SAMPLES)\r
             {\r
                 return error(GL_INVALID_VALUE);\r
             }\r
@@ -4423,20 +4423,20 @@ void GL_APIENTRY glRenderbufferStorageMultisampleANGLE(GLenum target, GLsizei sa
             switch(internalformat)\r
             {\r
               case GL_DEPTH_COMPONENT16:\r
-                context->setRenderbufferStorage(new es2::Depthbuffer(width, height, samples));\r
+                context->setRenderbufferStorage(new rad::Depthbuffer(width, height, samples));\r
                 break;\r
               case GL_RGBA4:\r
               case GL_RGB5_A1:\r
               case GL_RGB565:\r
               case GL_RGB8_OES:\r
               case GL_RGBA8_OES:\r
-                context->setRenderbufferStorage(new es2::Colorbuffer(width, height, internalformat, samples));\r
+                context->setRenderbufferStorage(new rad::Colorbuffer(width, height, internalformat, samples));\r
                 break;\r
               case GL_STENCIL_INDEX8:\r
-                context->setRenderbufferStorage(new es2::Stencilbuffer(width, height, samples));\r
+                context->setRenderbufferStorage(new rad::Stencilbuffer(width, height, samples));\r
                 break;\r
               case GL_DEPTH24_STENCIL8_OES:\r
-                context->setRenderbufferStorage(new es2::DepthStencilbuffer(width, height, samples));\r
+                context->setRenderbufferStorage(new rad::DepthStencilbuffer(width, height, samples));\r
                 break;\r
               default:\r
                 return error(GL_INVALID_ENUM);\r
@@ -4460,11 +4460,11 @@ void GL_APIENTRY glSampleCoverage(GLclampf value, GLboolean invert)
 \r
     try\r
     {\r
-        es2::Context* context = es2::getContext();\r
+        rad::Context* context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            context->setSampleCoverageParams(es2::clamp01(value), invert == GL_TRUE);\r
+            context->setSampleCoverageParams(rad::clamp01(value), invert == GL_TRUE);\r
         }\r
     }\r
     catch(std::bad_alloc&)\r
@@ -4484,11 +4484,11 @@ void GL_APIENTRY glSetFenceNV(GLuint fence, GLenum condition)
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Fence *fenceObject = context->getFence(fence);\r
+            rad::Fence *fenceObject = context->getFence(fence);\r
 \r
             if(fenceObject == NULL)\r
             {\r
@@ -4515,7 +4515,7 @@ void GL_APIENTRY glScissor(GLint x, GLint y, GLsizei width, GLsizei height)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context* context = es2::getContext();\r
+        rad::Context* context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -4557,11 +4557,11 @@ void GL_APIENTRY glShaderSource(GLuint shader, GLsizei count, const GLchar *cons
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Shader *shaderObject = context->getShader(shader);\r
+            rad::Shader *shaderObject = context->getShader(shader);\r
 \r
             if(!shaderObject)\r
             {\r
@@ -4620,7 +4620,7 @@ void GL_APIENTRY glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLui
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -4662,7 +4662,7 @@ void GL_APIENTRY glStencilMaskSeparate(GLenum face, GLuint mask)
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -4750,7 +4750,7 @@ void GL_APIENTRY glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLe
             return error(GL_INVALID_ENUM);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -4777,11 +4777,11 @@ GLboolean GL_APIENTRY glTestFenceNV(GLuint fence)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Fence *fenceObject = context->getFence(fence);\r
+            rad::Fence *fenceObject = context->getFence(fence);\r
 \r
             if(fenceObject == NULL)\r
             {\r
@@ -4900,15 +4900,15 @@ void GL_APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalformat,
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
             switch(target)\r
             {\r
               case GL_TEXTURE_2D:\r
-                if(width > (es2::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level) ||\r
-                   height > (es2::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level))\r
+                if(width > (rad::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level) ||\r
+                   height > (rad::IMPLEMENTATION_MAX_TEXTURE_SIZE >> level))\r
                 {\r
                     return error(GL_INVALID_VALUE);\r
                 }\r
@@ -4924,8 +4924,8 @@ void GL_APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalformat,
                     return error(GL_INVALID_VALUE);\r
                 }\r
 \r
-                if(width > (es2::IMPLEMENTATION_MAX_CUBE_MAP_TEXTURE_SIZE >> level) ||\r
-                   height > (es2::IMPLEMENTATION_MAX_CUBE_MAP_TEXTURE_SIZE >> level))\r
+                if(width > (rad::IMPLEMENTATION_MAX_CUBE_MAP_TEXTURE_SIZE >> level) ||\r
+                   height > (rad::IMPLEMENTATION_MAX_CUBE_MAP_TEXTURE_SIZE >> level))\r
                 {\r
                     return error(GL_INVALID_VALUE);\r
                 }\r
@@ -4951,7 +4951,7 @@ void GL_APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalformat,
                        \r
             if(target == GL_TEXTURE_2D)\r
             {\r
-                es2::Texture2D *texture = context->getTexture2D();\r
+                rad::Texture2D *texture = context->getTexture2D();\r
 \r
                 if(!texture)\r
                 {\r
@@ -4962,7 +4962,7 @@ void GL_APIENTRY glTexImage2D(GLenum target, GLint level, GLint internalformat,
             }\r
             else\r
             {\r
-                es2::TextureCubeMap *texture = context->getTextureCubeMap();\r
+                rad::TextureCubeMap *texture = context->getTextureCubeMap();\r
 \r
                 if(!texture)\r
                 {\r
@@ -4985,11 +4985,11 @@ void GL_APIENTRY glTexParameterf(GLenum target, GLenum pname, GLfloat param)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Texture *texture;\r
+            rad::Texture *texture;\r
 \r
             switch(target)\r
             {\r
@@ -5060,11 +5060,11 @@ void GL_APIENTRY glTexParameteri(GLenum target, GLenum pname, GLint param)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Texture *texture;\r
+            rad::Texture *texture;\r
 \r
             switch(target)\r
             {\r
@@ -5139,7 +5139,7 @@ void GL_APIENTRY glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLin
 \r
     try\r
     {\r
-        if(!es2::IsTextureTarget(target))\r
+        if(!rad::IsTextureTarget(target))\r
         {\r
             return error(GL_INVALID_ENUM);\r
         }\r
@@ -5154,7 +5154,7 @@ void GL_APIENTRY glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLin
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        if(!es2::CheckTextureFormatType(format, type))\r
+        if(!rad::CheckTextureFormatType(format, type))\r
         {\r
             return error(GL_INVALID_ENUM);\r
         }\r
@@ -5164,27 +5164,27 @@ void GL_APIENTRY glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLin
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            if(level > es2::IMPLEMENTATION_MAX_TEXTURE_LEVELS)\r
+            if(level > rad::IMPLEMENTATION_MAX_TEXTURE_LEVELS)\r
             {\r
                 return error(GL_INVALID_VALUE);\r
             }\r
 \r
             if(target == GL_TEXTURE_2D)\r
             {\r
-                es2::Texture2D *texture = context->getTexture2D();\r
+                rad::Texture2D *texture = context->getTexture2D();\r
 \r
                 if(validateSubImageParams(false, width, height, xoffset, yoffset, target, level, format, texture))\r
                                {\r
                                        texture->subImage(level, xoffset, yoffset, width, height, format, type, context->getUnpackAlignment(), pixels);\r
                                }\r
             }\r
-            else if(es2::IsCubemapTextureTarget(target))\r
+            else if(rad::IsCubemapTextureTarget(target))\r
             {\r
-                es2::TextureCubeMap *texture = context->getTextureCubeMap();\r
+                rad::TextureCubeMap *texture = context->getTextureCubeMap();\r
                                \r
                                if(validateSubImageParams(false, width, height, xoffset, yoffset, target, level, format, texture))\r
                                {\r
@@ -5224,11 +5224,11 @@ void GL_APIENTRY glUniform1fv(GLint location, GLsizei count, const GLfloat* v)
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *program = context->getCurrentProgram();\r
+            rad::Program *program = context->getCurrentProgram();\r
 \r
             if(!program)\r
             {\r
@@ -5268,11 +5268,11 @@ void GL_APIENTRY glUniform1iv(GLint location, GLsizei count, const GLint* v)
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *program = context->getCurrentProgram();\r
+            rad::Program *program = context->getCurrentProgram();\r
 \r
             if(!program)\r
             {\r
@@ -5314,11 +5314,11 @@ void GL_APIENTRY glUniform2fv(GLint location, GLsizei count, const GLfloat* v)
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *program = context->getCurrentProgram();\r
+            rad::Program *program = context->getCurrentProgram();\r
 \r
             if(!program)\r
             {\r
@@ -5360,11 +5360,11 @@ void GL_APIENTRY glUniform2iv(GLint location, GLsizei count, const GLint* v)
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *program = context->getCurrentProgram();\r
+            rad::Program *program = context->getCurrentProgram();\r
 \r
             if(!program)\r
             {\r
@@ -5406,11 +5406,11 @@ void GL_APIENTRY glUniform3fv(GLint location, GLsizei count, const GLfloat* v)
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *program = context->getCurrentProgram();\r
+            rad::Program *program = context->getCurrentProgram();\r
 \r
             if(!program)\r
             {\r
@@ -5452,11 +5452,11 @@ void GL_APIENTRY glUniform3iv(GLint location, GLsizei count, const GLint* v)
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *program = context->getCurrentProgram();\r
+            rad::Program *program = context->getCurrentProgram();\r
 \r
             if(!program)\r
             {\r
@@ -5498,11 +5498,11 @@ void GL_APIENTRY glUniform4fv(GLint location, GLsizei count, const GLfloat* v)
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *program = context->getCurrentProgram();\r
+            rad::Program *program = context->getCurrentProgram();\r
 \r
             if(!program)\r
             {\r
@@ -5544,11 +5544,11 @@ void GL_APIENTRY glUniform4iv(GLint location, GLsizei count, const GLint* v)
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *program = context->getCurrentProgram();\r
+            rad::Program *program = context->getCurrentProgram();\r
 \r
             if(!program)\r
             {\r
@@ -5584,11 +5584,11 @@ void GL_APIENTRY glUniformMatrix2fv(GLint location, GLsizei count, GLboolean tra
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *program = context->getCurrentProgram();\r
+            rad::Program *program = context->getCurrentProgram();\r
 \r
             if(!program)\r
             {\r
@@ -5624,11 +5624,11 @@ void GL_APIENTRY glUniformMatrix3fv(GLint location, GLsizei count, GLboolean tra
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *program = context->getCurrentProgram();\r
+            rad::Program *program = context->getCurrentProgram();\r
 \r
             if(!program)\r
             {\r
@@ -5664,11 +5664,11 @@ void GL_APIENTRY glUniformMatrix4fv(GLint location, GLsizei count, GLboolean tra
             return;\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *program = context->getCurrentProgram();\r
+            rad::Program *program = context->getCurrentProgram();\r
 \r
             if(!program)\r
             {\r
@@ -5693,11 +5693,11 @@ void GL_APIENTRY glUseProgram(GLuint program)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(!programObject && program != 0)\r
             {\r
@@ -5731,11 +5731,11 @@ void GL_APIENTRY glValidateProgram(GLuint program)
 \r
     try\r
     {\r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::Program *programObject = context->getProgram(program);\r
+            rad::Program *programObject = context->getProgram(program);\r
 \r
             if(!programObject)\r
             {\r
@@ -5764,12 +5764,12 @@ void GL_APIENTRY glVertexAttrib1f(GLuint index, GLfloat x)
 \r
     try\r
     {\r
-        if(index >= es2::MAX_VERTEX_ATTRIBS)\r
+        if(index >= rad::MAX_VERTEX_ATTRIBS)\r
         {\r
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -5789,12 +5789,12 @@ void GL_APIENTRY glVertexAttrib1fv(GLuint index, const GLfloat* values)
 \r
     try\r
     {\r
-        if(index >= es2::MAX_VERTEX_ATTRIBS)\r
+        if(index >= rad::MAX_VERTEX_ATTRIBS)\r
         {\r
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -5814,12 +5814,12 @@ void GL_APIENTRY glVertexAttrib2f(GLuint index, GLfloat x, GLfloat y)
 \r
     try\r
     {\r
-        if(index >= es2::MAX_VERTEX_ATTRIBS)\r
+        if(index >= rad::MAX_VERTEX_ATTRIBS)\r
         {\r
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -5839,12 +5839,12 @@ void GL_APIENTRY glVertexAttrib2fv(GLuint index, const GLfloat* values)
 \r
     try\r
     {\r
-        if(index >= es2::MAX_VERTEX_ATTRIBS)\r
+        if(index >= rad::MAX_VERTEX_ATTRIBS)\r
         {\r
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -5864,12 +5864,12 @@ void GL_APIENTRY glVertexAttrib3f(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 \r
     try\r
     {\r
-        if(index >= es2::MAX_VERTEX_ATTRIBS)\r
+        if(index >= rad::MAX_VERTEX_ATTRIBS)\r
         {\r
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -5889,12 +5889,12 @@ void GL_APIENTRY glVertexAttrib3fv(GLuint index, const GLfloat* values)
 \r
     try\r
     {\r
-        if(index >= es2::MAX_VERTEX_ATTRIBS)\r
+        if(index >= rad::MAX_VERTEX_ATTRIBS)\r
         {\r
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -5914,12 +5914,12 @@ void GL_APIENTRY glVertexAttrib4f(GLuint index, GLfloat x, GLfloat y, GLfloat z,
 \r
     try\r
     {\r
-        if(index >= es2::MAX_VERTEX_ATTRIBS)\r
+        if(index >= rad::MAX_VERTEX_ATTRIBS)\r
         {\r
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -5939,12 +5939,12 @@ void GL_APIENTRY glVertexAttrib4fv(GLuint index, const GLfloat* values)
 \r
     try\r
     {\r
-        if(index >= es2::MAX_VERTEX_ATTRIBS)\r
+        if(index >= rad::MAX_VERTEX_ATTRIBS)\r
         {\r
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -5965,7 +5965,7 @@ void GL_APIENTRY glVertexAttribPointer(GLuint index, GLint size, GLenum type, GL
 \r
     try\r
     {\r
-        if(index >= es2::MAX_VERTEX_ATTRIBS)\r
+        if(index >= rad::MAX_VERTEX_ATTRIBS)\r
         {\r
             return error(GL_INVALID_VALUE);\r
         }\r
@@ -5993,7 +5993,7 @@ void GL_APIENTRY glVertexAttribPointer(GLuint index, GLint size, GLenum type, GL
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -6017,7 +6017,7 @@ void GL_APIENTRY glViewport(GLint x, GLint y, GLsizei width, GLsizei height)
             return error(GL_INVALID_VALUE);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -6059,7 +6059,7 @@ void GL_APIENTRY glBlitFramebufferANGLE(GLint srcX0, GLint srcY0, GLint srcX1, G
             return error(GL_INVALID_OPERATION);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
@@ -6098,12 +6098,6 @@ void GL_APIENTRY glTexImage3DOES(GLenum target, GLint level, GLenum internalform
 \r
 void GL_APIENTRY glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image)\r
 {\r
-       if(egl::getClientVersion() == 1)\r
-       {\r
-               static auto glEGLImageTargetTexture2DOES = (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)es1::getProcAddress("glEGLImageTargetTexture2DOES");\r
-               return glEGLImageTargetTexture2DOES(target, image);\r
-       }\r
-\r
     TRACE("(GLenum target = 0x%X, GLeglImageOES image = 0x%0.8p)", target, image);\r
 \r
     try\r
@@ -6121,18 +6115,18 @@ void GL_APIENTRY glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image
             return error(GL_INVALID_OPERATION);\r
         }\r
 \r
-        es2::Context *context = es2::getContext();\r
+        rad::Context *context = rad::getContext();\r
 \r
         if(context)\r
         {\r
-            es2::TextureExternal *texture = context->getTextureExternal();\r
+            rad::TextureExternal *texture = context->getTextureExternal();\r
 \r
             if(!texture)\r
             {\r
                 return error(GL_INVALID_OPERATION);\r
             }\r
 \r
-            es2::Image *glImage = static_cast<es2::Image*>(image);\r
+            rad::Image *glImage = static_cast<rad::Image*>(image);\r
 \r
             texture->setImage(glImage);\r
         }\r
similarity index 97%
rename from src/Radiance/libRAD/libGLESv2.def
rename to src/Radiance/libRAD/libRAD.def
index 07f295d..92e2e90 100644 (file)
-LIBRARY libGLESv2
-EXPORTS
-    glActiveTexture                 @1
-    glAttachShader                  @2
-    glBindAttribLocation            @3
-    glBindBuffer                    @4
-    glBindFramebuffer               @5
-    glBindRenderbuffer              @6
-    glBindTexture                   @7
-    glBlendColor                    @8
-    glBlendEquation                 @9
-    glBlendEquationSeparate         @10
-    glBlendFunc                     @11
-    glBlendFuncSeparate             @12
-    glBufferData                    @13
-    glBufferSubData                 @14
-    glCheckFramebufferStatus        @15
-    glClear                         @16
-    glClearColor                    @17
-    glClearDepthf                   @18
-    glClearStencil                  @19
-    glColorMask                     @20
-    glCompileShader                 @21
-    glCompressedTexImage2D          @22
-    glCompressedTexSubImage2D       @23
-    glCopyTexImage2D                @24
-    glCopyTexSubImage2D             @25
-    glCreateProgram                 @26
-    glCreateShader                  @27
-    glCullFace                      @28
-    glDeleteBuffers                 @29
-    glDeleteFramebuffers            @30
-    glDeleteProgram                 @32
-    glDeleteRenderbuffers           @33
-    glDeleteShader                  @34
-    glDeleteTextures                @31
-    glDepthFunc                     @36
-    glDepthMask                     @37
-    glDepthRangef                   @38
-    glDetachShader                  @35
-    glDisable                       @39
-    glDisableVertexAttribArray      @40
-    glDrawArrays                    @41
-    glDrawElements                  @42
-    glEnable                        @43
-    glEnableVertexAttribArray       @44
-    glFinish                        @45
-    glFlush                         @46
-    glFramebufferRenderbuffer       @47
-    glFramebufferTexture2D          @48
-    glFrontFace                     @49
-    glGenBuffers                    @50
-    glGenFramebuffers               @52
-    glGenRenderbuffers              @53
-    glGenTextures                   @54
-    glGenerateMipmap                @51
-    glGetActiveAttrib               @55
-    glGetActiveUniform              @56
-    glGetAttachedShaders            @57
-    glGetAttribLocation             @58
-    glGetBooleanv                   @59
-    glGetBufferParameteriv          @60
-    glGetError                      @61
-    glGetFloatv                     @62
-    glGetFramebufferAttachmentParameteriv   @63
-    glGetIntegerv                   @64
-    glGetProgramInfoLog             @66
-    glGetProgramiv                  @65
-    glGetRenderbufferParameteriv    @67
-    glGetShaderInfoLog              @69
-    glGetShaderPrecisionFormat      @70
-    glGetShaderSource               @71
-    glGetShaderiv                   @68
-    glGetString                     @72
-    glGetTexParameterfv             @73
-    glGetTexParameteriv             @74
-    glGetUniformLocation            @77
-    glGetUniformfv                  @75
-    glGetUniformiv                  @76
-    glGetVertexAttribPointerv       @80
-    glGetVertexAttribfv             @78
-    glGetVertexAttribiv             @79
-    glHint                          @81
-    glIsBuffer                      @82
-    glIsEnabled                     @83
-    glIsFramebuffer                 @84
-    glIsProgram                     @85
-    glIsRenderbuffer                @86
-    glIsShader                      @87
-    glIsTexture                     @88
-    glLineWidth                     @89
-    glLinkProgram                   @90
-    glPixelStorei                   @91
-    glPolygonOffset                 @92
-    glReadPixels                    @93
-    glReleaseShaderCompiler         @94
-    glRenderbufferStorage           @95
-    glSampleCoverage                @96
-    glScissor                       @97
-    glShaderBinary                  @98
-    glShaderSource                  @99
-    glStencilFunc                   @100
-    glStencilFuncSeparate           @101
-    glStencilMask                   @102
-    glStencilMaskSeparate           @103
-    glStencilOp                     @104
-    glStencilOpSeparate             @105
-    glTexImage2D                    @106
-    glTexParameterf                 @107
-    glTexParameterfv                @108
-    glTexParameteri                 @109
-    glTexParameteriv                @110
-    glTexSubImage2D                 @111
-    glUniform1f                     @112
-    glUniform1fv                    @113
-    glUniform1i                     @114
-    glUniform1iv                    @115
-    glUniform2f                     @116
-    glUniform2fv                    @117
-    glUniform2i                     @118
-    glUniform2iv                    @119
-    glUniform3f                     @120
-    glUniform3fv                    @121
-    glUniform3i                     @122
-    glUniform3iv                    @123
-    glUniform4f                     @124
-    glUniform4fv                    @125
-    glUniform4i                     @126
-    glUniform4iv                    @127
-    glUniformMatrix2fv              @128
-    glUniformMatrix3fv              @129
-    glUniformMatrix4fv              @130
-    glUseProgram                    @131
-    glValidateProgram               @132
-    glVertexAttrib1f                @133
-    glVertexAttrib1fv               @134
-    glVertexAttrib2f                @135
-    glVertexAttrib2fv               @136
-    glVertexAttrib3f                @137
-    glVertexAttrib3fv               @138
-    glVertexAttrib4f                @139
-    glVertexAttrib4fv               @140
-    glVertexAttribPointer           @141
-    glViewport                      @142
-
-    ; Extensions
-    glTexImage3DOES                 @143
-    glBlitFramebufferANGLE          @149
-    glRenderbufferStorageMultisampleANGLE @150
-    glDeleteFencesNV                @151
-    glFinishFenceNV                 @152
-    glGenFencesNV                   @153
-    glGetFenceivNV                  @154
-    glIsFenceNV                     @155
-    glSetFenceNV                    @156
-    glTestFenceNV                   @157
-    ;glGetTranslatedShaderSourceANGLE @159
-    ;glTexStorage2DEXT               @160
-    glGetGraphicsResetStatusEXT     @161
-    glReadnPixelsEXT                @162
-    glGetnUniformfvEXT              @163
-    glGetnUniformivEXT              @164
-       glGenQueriesEXT                 @165
-    glDeleteQueriesEXT              @166
-    glIsQueryEXT                    @167
-    glBeginQueryEXT                 @168
-    glEndQueryEXT                   @169
-    glGetQueryivEXT                 @170
-    glGetQueryObjectuivEXT          @171
-
-    ; EGL dependencies
-    glCreateContext
-    glGetProcAddress
-
-       createFrameBuffer
-       createBackBuffer
-       createDepthStencil
-
-       Register
\ No newline at end of file
+LIBRARY libRAD\r
+EXPORTS\r
+    glActiveTexture                 @1\r
+    glAttachShader                  @2\r
+    glBindAttribLocation            @3\r
+    glBindBuffer                    @4\r
+    glBindFramebuffer               @5\r
+    glBindRenderbuffer              @6\r
+    glBindTexture                   @7\r
+    glBlendColor                    @8\r
+    glBlendEquation                 @9\r
+    glBlendEquationSeparate         @10\r
+    glBlendFunc                     @11\r
+    glBlendFuncSeparate             @12\r
+    glBufferData                    @13\r
+    glBufferSubData                 @14\r
+    glCheckFramebufferStatus        @15\r
+    glClear                         @16\r
+    glClearColor                    @17\r
+    glClearDepthf                   @18\r
+    glClearStencil                  @19\r
+    glColorMask                     @20\r
+    glCompileShader                 @21\r
+    glCompressedTexImage2D          @22\r
+    glCompressedTexSubImage2D       @23\r
+    glCopyTexImage2D                @24\r
+    glCopyTexSubImage2D             @25\r
+    glCreateProgram                 @26\r
+    glCreateShader                  @27\r
+    glCullFace                      @28\r
+    glDeleteBuffers                 @29\r
+    glDeleteFramebuffers            @30\r
+    glDeleteProgram                 @32\r
+    glDeleteRenderbuffers           @33\r
+    glDeleteShader                  @34\r
+    glDeleteTextures                @31\r
+    glDepthFunc                     @36\r
+    glDepthMask                     @37\r
+    glDepthRangef                   @38\r
+    glDetachShader                  @35\r
+    glDisable                       @39\r
+    glDisableVertexAttribArray      @40\r
+    glDrawArrays                    @41\r
+    glDrawElements                  @42\r
+    glEnable                        @43\r
+    glEnableVertexAttribArray       @44\r
+    glFinish                        @45\r
+    glFlush                         @46\r
+    glFramebufferRenderbuffer       @47\r
+    glFramebufferTexture2D          @48\r
+    glFrontFace                     @49\r
+    glGenBuffers                    @50\r
+    glGenFramebuffers               @52\r
+    glGenRenderbuffers              @53\r
+    glGenTextures                   @54\r
+    glGenerateMipmap                @51\r
+    glGetActiveAttrib               @55\r
+    glGetActiveUniform              @56\r
+    glGetAttachedShaders            @57\r
+    glGetAttribLocation             @58\r
+    glGetBooleanv                   @59\r
+    glGetBufferParameteriv          @60\r
+    glGetError                      @61\r
+    glGetFloatv                     @62\r
+    glGetFramebufferAttachmentParameteriv   @63\r
+    glGetIntegerv                   @64\r
+    glGetProgramInfoLog             @66\r
+    glGetProgramiv                  @65\r
+    glGetRenderbufferParameteriv    @67\r
+    glGetShaderInfoLog              @69\r
+    glGetShaderPrecisionFormat      @70\r
+    glGetShaderSource               @71\r
+    glGetShaderiv                   @68\r
+    glGetString                     @72\r
+    glGetTexParameterfv             @73\r
+    glGetTexParameteriv             @74\r
+    glGetUniformLocation            @77\r
+    glGetUniformfv                  @75\r
+    glGetUniformiv                  @76\r
+    glGetVertexAttribPointerv       @80\r
+    glGetVertexAttribfv             @78\r
+    glGetVertexAttribiv             @79\r
+    glHint                          @81\r
+    glIsBuffer                      @82\r
+    glIsEnabled                     @83\r
+    glIsFramebuffer                 @84\r
+    glIsProgram                     @85\r
+    glIsRenderbuffer                @86\r
+    glIsShader                      @87\r
+    glIsTexture                     @88\r
+    glLineWidth                     @89\r
+    glLinkProgram                   @90\r
+    glPixelStorei                   @91\r
+    glPolygonOffset                 @92\r
+    glReadPixels                    @93\r
+    glReleaseShaderCompiler         @94\r
+    glRenderbufferStorage           @95\r
+    glSampleCoverage                @96\r
+    glScissor                       @97\r
+    glShaderBinary                  @98\r
+    glShaderSource                  @99\r
+    glStencilFunc                   @100\r
+    glStencilFuncSeparate           @101\r
+    glStencilMask                   @102\r
+    glStencilMaskSeparate           @103\r
+    glStencilOp                     @104\r
+    glStencilOpSeparate             @105\r
+    glTexImage2D                    @106\r
+    glTexParameterf                 @107\r
+    glTexParameterfv                @108\r
+    glTexParameteri                 @109\r
+    glTexParameteriv                @110\r
+    glTexSubImage2D                 @111\r
+    glUniform1f                     @112\r
+    glUniform1fv                    @113\r
+    glUniform1i                     @114\r
+    glUniform1iv                    @115\r
+    glUniform2f                     @116\r
+    glUniform2fv                    @117\r
+    glUniform2i                     @118\r
+    glUniform2iv                    @119\r
+    glUniform3f                     @120\r
+    glUniform3fv                    @121\r
+    glUniform3i                     @122\r
+    glUniform3iv                    @123\r
+    glUniform4f                     @124\r
+    glUniform4fv                    @125\r
+    glUniform4i                     @126\r
+    glUniform4iv                    @127\r
+    glUniformMatrix2fv              @128\r
+    glUniformMatrix3fv              @129\r
+    glUniformMatrix4fv              @130\r
+    glUseProgram                    @131\r
+    glValidateProgram               @132\r
+    glVertexAttrib1f                @133\r
+    glVertexAttrib1fv               @134\r
+    glVertexAttrib2f                @135\r
+    glVertexAttrib2fv               @136\r
+    glVertexAttrib3f                @137\r
+    glVertexAttrib3fv               @138\r
+    glVertexAttrib4f                @139\r
+    glVertexAttrib4fv               @140\r
+    glVertexAttribPointer           @141\r
+    glViewport                      @142\r
+\r
+    ; Extensions\r
+    glTexImage3DOES                 @143\r
+    glBlitFramebufferANGLE          @149\r
+    glRenderbufferStorageMultisampleANGLE @150\r
+    glDeleteFencesNV                @151\r
+    glFinishFenceNV                 @152\r
+    glGenFencesNV                   @153\r
+    glGetFenceivNV                  @154\r
+    glIsFenceNV                     @155\r
+    glSetFenceNV                    @156\r
+    glTestFenceNV                   @157\r
+    ;glGetTranslatedShaderSourceANGLE @159\r
+    ;glTexStorage2DEXT               @160\r
+    glGetGraphicsResetStatusEXT     @161\r
+    glReadnPixelsEXT                @162\r
+    glGetnUniformfvEXT              @163\r
+    glGetnUniformivEXT              @164\r
+       glGenQueriesEXT                 @165\r
+    glDeleteQueriesEXT              @166\r
+    glIsQueryEXT                    @167\r
+    glBeginQueryEXT                 @168\r
+    glEndQueryEXT                   @169\r
+    glGetQueryivEXT                 @170\r
+    glGetQueryObjectuivEXT          @171\r
+\r
+    ; EGL dependencies\r
+    glCreateContext\r
+    glGetProcAddress\r
+\r
+       createFrameBuffer\r
+       createBackBuffer\r
+       createDepthStencil\r
+\r
+       Register\r
similarity index 96%
rename from src/Radiance/libRAD/libGLESv2.rc
rename to src/Radiance/libRAD/libRAD.rc
index 919c7ed..c8b346a 100644 (file)
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include <windows.h>
-#include "../../common/Version.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "#include ""../common/version.h""\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION
- PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "FileDescription", "SwiftShader libGLESv2 Dynamic Link Library"
-            VALUE "FileVersion", VERSION_STRING
-            VALUE "InternalName", "libGLESv2"
-            VALUE "LegalCopyright", "Copyright (C) 2012 TransGaming Inc."
-            VALUE "OriginalFilename", "libGLESv2.dll"
-            VALUE "PrivateBuild", VERSION_STRING
-            VALUE "ProductName", "SwiftShader libGLESv2 Dynamic Link Library"
-            VALUE "ProductVersion", VERSION_STRING
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
+// Microsoft Visual C++ generated resource script.\r
+//\r
+#include "resource.h"\r
+\r
+#define APSTUDIO_READONLY_SYMBOLS\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Generated from the TEXTINCLUDE 2 resource.\r
+//\r
+#include <windows.h>\r
+#include "../../common/Version.h"\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+#undef APSTUDIO_READONLY_SYMBOLS\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+// English (U.S.) resources\r
+\r
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
+#ifdef _WIN32\r
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r
+#pragma code_page(1252)\r
+#endif //_WIN32\r
+\r
+#ifdef APSTUDIO_INVOKED\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// TEXTINCLUDE\r
+//\r
+\r
+1 TEXTINCLUDE \r
+BEGIN\r
+    "resource.h\0"\r
+END\r
+\r
+2 TEXTINCLUDE \r
+BEGIN\r
+    "#include ""afxres.h""\r\n"\r
+    "#include ""../common/version.h""\0"\r
+END\r
+\r
+3 TEXTINCLUDE \r
+BEGIN\r
+    "\r\n"\r
+    "\0"\r
+END\r
+\r
+#endif    // APSTUDIO_INVOKED\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Version\r
+//\r
+\r
+VS_VERSION_INFO VERSIONINFO\r
+ FILEVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION\r
+ PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION\r
+ FILEFLAGSMASK 0x17L\r
+#ifdef _DEBUG\r
+ FILEFLAGS 0x1L\r
+#else\r
+ FILEFLAGS 0x0L\r
+#endif\r
+ FILEOS 0x4L\r
+ FILETYPE 0x2L\r
+ FILESUBTYPE 0x0L\r
+BEGIN\r
+    BLOCK "StringFileInfo"\r
+    BEGIN\r
+        BLOCK "040904b0"\r
+        BEGIN\r
+            VALUE "FileDescription", "SwiftShader libGLESv2 Dynamic Link Library"\r
+            VALUE "FileVersion", VERSION_STRING\r
+            VALUE "InternalName", "libGLESv2"\r
+            VALUE "LegalCopyright", "Copyright (C) 2012 TransGaming Inc."\r
+            VALUE "OriginalFilename", "libGLESv2.dll"\r
+            VALUE "PrivateBuild", VERSION_STRING\r
+            VALUE "ProductName", "SwiftShader libGLESv2 Dynamic Link Library"\r
+            VALUE "ProductVersion", VERSION_STRING\r
+        END\r
+    END\r
+    BLOCK "VarFileInfo"\r
+    BEGIN\r
+        VALUE "Translation", 0x409, 1200\r
+    END\r
+END\r
+\r
+#endif    // English (U.S.) resources\r
+/////////////////////////////////////////////////////////////////////////////\r
+\r
+\r
+\r
+#ifndef APSTUDIO_INVOKED\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Generated from the TEXTINCLUDE 3 resource.\r
+//\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+#endif    // not APSTUDIO_INVOKED\r
similarity index 92%
rename from src/Radiance/libRAD/libGLESv2.vcxproj
rename to src/Radiance/libRAD/libRAD.vcxproj
index c833496..d91162e 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
     <ProjectConfiguration Include="Debug|Win32">\r
@@ -15,8 +15,8 @@
     </ProjectConfiguration>\r
   </ItemGroup>\r
   <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{B5871A7A-968C-42E3-A33B-981E6F448E78}</ProjectGuid>\r
-    <RootNamespace>libGLESv2</RootNamespace>\r
+    <ProjectGuid>{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}</ProjectGuid>\r
+    <RootNamespace>libRAD</RootNamespace>\r
     <Keyword>Win32Proj</Keyword>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>\r
+      <ModuleDefinitionFile>libRAD.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <TargetMachine>MachineX86</TargetMachine>\r
     </Link>\r
     <PostBuildEvent>\r
       <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)\"\r
-copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>\r
+copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
@@ -115,7 +115,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
     <Link>\r
       <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>\r
-      <ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>\r
+      <ModuleDefinitionFile>libRAD.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
@@ -124,7 +124,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
     </Link>\r
     <PostBuildEvent>\r
       <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)\"\r
-copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>\r
+copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">\r
@@ -147,7 +147,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
     <Link>\r
       <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>\r
-      <ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>\r
+      <ModuleDefinitionFile>libRAD.def</ModuleDefinitionFile>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
@@ -156,7 +156,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
     </Link>\r
     <PostBuildEvent>\r
       <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)\"\r
-copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>\r
+copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
@@ -169,7 +169,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
     <ClCompile Include="HandleAllocator.cpp" />\r
     <ClCompile Include="Image.cpp" />\r
     <ClCompile Include="IndexDataManager.cpp" />\r
-    <ClCompile Include="libGLESv2.cpp" />\r
+    <ClCompile Include="libRAD.cpp" />\r
     <ClCompile Include="main.cpp" />\r
     <ClCompile Include="Program.cpp" />\r
     <ClCompile Include="Query.cpp" />\r
@@ -208,10 +208,10 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
     <ClInclude Include="VertexDataManager.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <None Include="libGLESv2.def" />\r
+    <None Include="libRAD.def" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="libGLESv2.rc" />\r
+    <ResourceCompile Include="libRAD.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="..\..\SwiftShader\SwiftShader.vcxproj">\r
@@ -223,10 +223,10 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
       <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>\r
     </ProjectReference>\r
     <ProjectReference Include="..\compiler\Compiler.vcxproj">\r
-      <Project>{5b3a6db8-1e7e-40d7-92b9-da8aae619fad}</Project>\r
+      <Project>{5aebf8b8-3454-4984-9d77-a8f13bc0377b}</Project>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r
similarity index 93%
rename from src/Radiance/libRAD/libGLESv2.vcxproj.filters
rename to src/Radiance/libRAD/libRAD.vcxproj.filters
index 91125de..60d6272 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
     <Filter Include="Source Files">\r
@@ -32,7 +32,7 @@
     <ClCompile Include="IndexDataManager.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="libGLESv2.cpp">\r
+    <ClCompile Include="libRAD.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="main.cpp">\r
     </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="libGLESv2.rc" />\r
+    <ResourceCompile Include="libRAD.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <None Include="libGLESv2.def" />\r
+    <None Include="libRAD.def" />\r
   </ItemGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r
index 14e4053..3add27b 100644 (file)
@@ -53,15 +53,6 @@ CONSTRUCTOR static bool glAttachProcess()
        egl::getCurrentContext = (egl::Context *(*)())getProcAddress(libEGL, "eglGetCurrentContext");\r
        egl::getCurrentDisplay = (egl::Display *(*)())getProcAddress(libEGL, "eglGetCurrentDisplay");\r
 \r
-       #if defined(_WIN32)\r
-       const char *libGLES_CM_lib = "libGLES_CM.dll";\r
-       #else\r
-       const char *libGLES_CM_lib = "libGLES_CM.so.1";\r
-       #endif\r
-\r
-       libGLES_CM = loadLibrary(libGLES_CM_lib);\r
-       es1::getProcAddress = (__eglMustCastToProperFunctionPointerType (*)(const char*))getProcAddress(libGLES_CM, "glGetProcAddress");\r
-\r
     return libEGL != 0;\r
 }\r
 \r
@@ -71,7 +62,6 @@ DESTRUCTOR static void glDetachProcess()
 \r
        glDetachThread();\r
        freeLibrary(libEGL);\r
-       freeLibrary(libGLES_CM);\r
 }\r
 \r
 #if defined(_WIN32)\r
@@ -99,15 +89,15 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved
 }\r
 #endif\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
-es2::Context *getContext()\r
+rad::Context *getContext()\r
 {\r
        egl::Context *context = egl::getCurrentContext();\r
        \r
        if(context && context->getClientVersion() == 2)\r
        {\r
-               return static_cast<es2::Context*>(context);\r
+               return static_cast<rad::Context*>(context);\r
        }\r
        \r
        return 0;\r
@@ -139,7 +129,7 @@ GLint getClientVersion()
 // Records an error code\r
 void error(GLenum errorCode)\r
 {\r
-    es2::Context *context = es2::getContext();\r
+    rad::Context *context = rad::getContext();\r
 \r
     if(context)\r
     {\r
@@ -176,10 +166,4 @@ namespace egl
        egl::Display *(*getCurrentDisplay)() = 0;\r
 }\r
 \r
-namespace es1\r
-{\r
-       __eglMustCastToProperFunctionPointerType (*getProcAddress)(const char *procname) = 0;\r
-}\r
-\r
 void *libEGL = 0;   // Handle to the libEGL module\r
-void *libGLES_CM = 0;   // Handle to the libGLES_CM module\r
index d367390..6af6222 100644 (file)
@@ -23,7 +23,7 @@
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
-namespace es2
+namespace rad
 {
        Context *getContext();
        egl::Display *getDisplay();
@@ -52,13 +52,6 @@ namespace egl
        extern egl::Display *(*getCurrentDisplay)();
 }
 
-// libGLES_CM dependencies
-namespace es1
-{
-       extern __eglMustCastToProperFunctionPointerType (*getProcAddress)(const char *procname);
-}
-
 extern void *libEGL;       // Handle to the libEGL module
-extern void *libGLES_CM;   // Handle to the libGLES_CM module
 
 #endif   // LIBGLESV2_MAIN_H_
index 6ac1f37..1197155 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <math.h>
 
-namespace es2
+namespace rad
 {
 inline bool isPow2(int x)
 {
index 39adaad..0292bf5 100644 (file)
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by libGLESv2.rc
+// Used by libRAD.rc
 
 // Next default values for new objects
 // 
index 6d01e92..bef4a46 100644 (file)
@@ -20,7 +20,7 @@
 #include <limits>\r
 #include <stdio.h>\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
        int UniformComponentCount(GLenum type)\r
        {\r
@@ -440,7 +440,7 @@ namespace es2
        }\r
 }\r
 \r
-namespace es2sw\r
+namespace rad2sw\r
 {\r
        sw::DepthCompareMode ConvertDepthComparison(GLenum comparison)\r
        {\r
@@ -478,7 +478,7 @@ namespace es2sw
                return sw::STENCIL_ALWAYS;\r
        }\r
 \r
-       sw::Color<float> ConvertColor(es2::Color color)\r
+       sw::Color<float> ConvertColor(rad::Color color)\r
        {\r
                return sw::Color<float>(color.red, color.green, color.blue, color.alpha);\r
        }\r
@@ -630,36 +630,36 @@ namespace es2sw
                }\r
        }\r
 \r
-       bool ConvertPrimitiveType(GLenum primitiveType, GLsizei elementCount,  es2::PrimitiveType &swPrimitiveType, int &primitiveCount)\r
+       bool ConvertPrimitiveType(GLenum primitiveType, GLsizei elementCount,  rad::PrimitiveType &swPrimitiveType, int &primitiveCount)\r
        {\r
                switch(primitiveType)\r
                {\r
                case GL_POINTS:\r
-                       swPrimitiveType = es2::DRAW_POINTLIST;\r
+                       swPrimitiveType = rad::DRAW_POINTLIST;\r
                        primitiveCount = elementCount;\r
                        break;\r
                case GL_LINES:\r
-                       swPrimitiveType = es2::DRAW_LINELIST;\r
+                       swPrimitiveType = rad::DRAW_LINELIST;\r
                        primitiveCount = elementCount / 2;\r
                        break;\r
                case GL_LINE_LOOP:\r
-                       swPrimitiveType = es2::DRAW_LINELOOP;\r
+                       swPrimitiveType = rad::DRAW_LINELOOP;\r
                        primitiveCount = elementCount;\r
                        break;\r
                case GL_LINE_STRIP:\r
-                       swPrimitiveType = es2::DRAW_LINESTRIP;\r
+                       swPrimitiveType = rad::DRAW_LINESTRIP;\r
                        primitiveCount = elementCount - 1;\r
                        break;\r
                case GL_TRIANGLES:\r
-                       swPrimitiveType = es2::DRAW_TRIANGLELIST;\r
+                       swPrimitiveType = rad::DRAW_TRIANGLELIST;\r
                        primitiveCount = elementCount / 3;\r
                        break;\r
                case GL_TRIANGLE_STRIP:\r
-                       swPrimitiveType = es2::DRAW_TRIANGLESTRIP;\r
+                       swPrimitiveType = rad::DRAW_TRIANGLESTRIP;\r
                        primitiveCount = elementCount - 2;\r
                        break;\r
                case GL_TRIANGLE_FAN:\r
-                       swPrimitiveType = es2::DRAW_TRIANGLEFAN;\r
+                       swPrimitiveType = rad::DRAW_TRIANGLEFAN;\r
                        primitiveCount = elementCount - 2;\r
                        break;\r
                default:\r
@@ -686,7 +686,7 @@ namespace es2sw
        }\r
 }\r
 \r
-namespace sw2es\r
+namespace sw2rad\r
 {\r
        unsigned int GetStencilSize(sw::Format stencilFormat)\r
        {\r
index 3404648..51ec56c 100644 (file)
@@ -24,7 +24,7 @@
 \r
 #include <string>\r
 \r
-namespace es2\r
+namespace rad\r
 {\r
        struct Color;\r
 \r
@@ -53,11 +53,11 @@ namespace es2
        bool IsStencilRenderable(GLenum internalformat);\r
 }\r
 \r
-namespace es2sw\r
+namespace rad2sw\r
 {\r
        sw::DepthCompareMode ConvertDepthComparison(GLenum comparison);\r
        sw::StencilCompareMode ConvertStencilComparison(GLenum comparison);\r
-       sw::Color<float> ConvertColor(es2::Color color);\r
+       sw::Color<float> ConvertColor(rad::Color color);\r
        sw::BlendFactor ConvertBlendFunc(GLenum blend);\r
        sw::BlendOperation ConvertBlendOp(GLenum blendOp);\r
        sw::StencilOperation ConvertStencilOp(GLenum stencilOp);\r
@@ -66,11 +66,11 @@ namespace es2sw
        unsigned int ConvertColorMask(bool red, bool green, bool blue, bool alpha);\r
        sw::FilterType ConvertMagFilter(GLenum magFilter);\r
        void ConvertMinFilter(GLenum texFilter, sw::FilterType *minFilter, sw::MipmapType *mipFilter, float maxAnisotropy);\r
-       bool ConvertPrimitiveType(GLenum primitiveType, GLsizei elementCount,  es2::PrimitiveType &swPrimitiveType, int &primitiveCount);\r
+       bool ConvertPrimitiveType(GLenum primitiveType, GLsizei elementCount,  rad::PrimitiveType &swPrimitiveType, int &primitiveCount);\r
        sw::Format ConvertRenderbufferFormat(GLenum format);\r
 }\r
 \r
-namespace sw2es\r
+namespace sw2rad\r
 {\r
        GLuint GetAlphaSize(sw::Format colorFormat);\r
        GLuint GetRedSize(sw::Format colorFormat);\r
index 087aa9a..ff70ee5 100644 (file)
@@ -236,6 +236,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGLESBasicTnL", "..\tests\t
                {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6} = {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}\r
        EndProjectSection\r
 EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{B7E24D8E-6BE9-4DEF-A8B9-6A6E60CA60E9}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libRAD", "Radiance\libRAD\libRAD.vcxproj", "{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2F6770B5-F168-4FCD-8A56-4DD95BEC8893} = {2F6770B5-F168-4FCD-8A56-4DD95BEC8893}\r
+       EndProjectSection\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Radiance", "Radiance", "{CA0EBD66-3F60-4F3D-8143-B31F14458B40}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "Radiance\libEGL\libEGL.vcxproj", "{2F6770B5-F168-4FCD-8A56-4DD95BEC8893}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003} = {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}\r
+       EndProjectSection\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Compiler", "Radiance\compiler\Compiler.vcxproj", "{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "Radiance\compiler\preprocessor\preprocessor.vcxproj", "{6303975E-7060-4CE7-8090-CB2DE0B840B4}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -627,6 +645,42 @@ Global
                {AB1EB229-D86C-41B3-8E20-7A7E1FF5DDF5}.Release|Win32.Build.0 = Release|Win32\r
                {AB1EB229-D86C-41B3-8E20-7A7E1FF5DDF5}.Release|x64.ActiveCfg = Release|x64\r
                {AB1EB229-D86C-41B3-8E20-7A7E1FF5DDF5}.Release|x64.Build.0 = Release|x64\r
+               {A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Debug|Win32.Build.0 = Debug|Win32\r
+               {A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Profile|Win32.ActiveCfg = Profile|Win32\r
+               {A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Profile|Win32.Build.0 = Profile|Win32\r
+               {A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Profile|x64.ActiveCfg = Profile|Win32\r
+               {A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Release|Win32.ActiveCfg = Release|Win32\r
+               {A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Release|Win32.Build.0 = Release|Win32\r
+               {A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Release|x64.ActiveCfg = Release|Win32\r
+               {2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Debug|Win32.Build.0 = Debug|Win32\r
+               {2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Profile|Win32.ActiveCfg = Profile|Win32\r
+               {2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Profile|Win32.Build.0 = Profile|Win32\r
+               {2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Profile|x64.ActiveCfg = Profile|Win32\r
+               {2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Release|Win32.ActiveCfg = Release|Win32\r
+               {2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Release|Win32.Build.0 = Release|Win32\r
+               {2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Release|x64.ActiveCfg = Release|Win32\r
+               {5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Debug|Win32.Build.0 = Debug|Win32\r
+               {5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Profile|Win32.ActiveCfg = Profile|Win32\r
+               {5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Profile|Win32.Build.0 = Profile|Win32\r
+               {5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Profile|x64.ActiveCfg = Profile|Win32\r
+               {5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Release|Win32.ActiveCfg = Release|Win32\r
+               {5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Release|Win32.Build.0 = Release|Win32\r
+               {5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Release|x64.ActiveCfg = Release|Win32\r
+               {6303975E-7060-4CE7-8090-CB2DE0B840B4}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {6303975E-7060-4CE7-8090-CB2DE0B840B4}.Debug|Win32.Build.0 = Debug|Win32\r
+               {6303975E-7060-4CE7-8090-CB2DE0B840B4}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {6303975E-7060-4CE7-8090-CB2DE0B840B4}.Profile|Win32.ActiveCfg = Release|Win32\r
+               {6303975E-7060-4CE7-8090-CB2DE0B840B4}.Profile|Win32.Build.0 = Release|Win32\r
+               {6303975E-7060-4CE7-8090-CB2DE0B840B4}.Profile|x64.ActiveCfg = Release|Win32\r
+               {6303975E-7060-4CE7-8090-CB2DE0B840B4}.Release|Win32.ActiveCfg = Release|Win32\r
+               {6303975E-7060-4CE7-8090-CB2DE0B840B4}.Release|Win32.Build.0 = Release|Win32\r
+               {6303975E-7060-4CE7-8090-CB2DE0B840B4}.Release|x64.ActiveCfg = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
@@ -660,8 +714,13 @@ Global
                {235B1D85-E6B6-45E2-BA5D-5C60396428FF} = {D33114D7-E582-4D61-B27D-FAB0297C43FF}\r
                {9DAFEE32-19F6-4410-AA09-2B564FB86F62} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}\r
                {9CF4408B-9B08-481F-95DA-3DF0846DABE4} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}\r
-               {09ABE661-9BC0-4152-A820-1FB0522CAC01} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}\r
                {04FC5430-3F1B-42A2-A18A-D8BB7E5B2733} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}\r
                {AB1EB229-D86C-41B3-8E20-7A7E1FF5DDF5} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}\r
+               {B7E24D8E-6BE9-4DEF-A8B9-6A6E60CA60E9} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}\r
+               {09ABE661-9BC0-4152-A820-1FB0522CAC01} = {B7E24D8E-6BE9-4DEF-A8B9-6A6E60CA60E9}\r
+               {A08DD1A8-998C-4FBB-8710-89B80D0BC3AD} = {CA0EBD66-3F60-4F3D-8143-B31F14458B40}\r
+               {2F6770B5-F168-4FCD-8A56-4DD95BEC8893} = {CA0EBD66-3F60-4F3D-8143-B31F14458B40}\r
+               {5AEBF8B8-3454-4984-9D77-A8F13BC0377B} = {CA0EBD66-3F60-4F3D-8143-B31F14458B40}\r
+               {6303975E-7060-4CE7-8090-CB2DE0B840B4} = {CA0EBD66-3F60-4F3D-8143-B31F14458B40}\r
        EndGlobalSection\r
 EndGlobal\r