Skip to content

S
swiftshader
Commit 9d4c9210 by Nicolas Capens Committed by Nicolas Capens
Options

Rename libGLESv2 references to libRAD. Rename the es2 namespace to rad.

BUG=18218488 Change-Id: Iaf64c9a42328c54f763db53a0830e3ceb45cb09c Reviewed-on: https://swiftshader-review.googlesource.com/1323Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent f97ae8b4
Showing with 300 additions and 318 deletions
src/Radiance/compiler/Compiler.vcxproj
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}</ProjectGuid> <ProjectGuid>{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}</ProjectGuid>
<RootNamespace>compiler</RootNamespace> <RootNamespace>compiler</RootNamespace>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<ProjectName>Compiler</ProjectName> <ProjectName>Compiler</ProjectName>
...@@ -203,8 +203,8 @@ ...@@ -203,8 +203,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="preprocessor\preprocessor.vcxproj"> <ProjectReference Include="preprocessor\preprocessor.vcxproj">
<Project>{92940255-ab4b-42fb-a2c4-0fab19c3c48a}</Project> <Project>{6303975e-7060-4ce7-8090-cb2de0b840b4}</Project>
<Private>true</Private> <Private>false</Private>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly> <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies> <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies> <LinkLibraryDependencies>true</LinkLibraryDependencies>
......
src/Radiance/compiler/OutputASM.cpp
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "common/debug.h" #include "common/debug.h"
#include "compiler/InfoSink.h" #include "compiler/InfoSink.h"
#include "libGLESv2/Shader.h" #include "libRAD/Shader.h"
#define GL_APICALL #define GL_APICALL
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
...@@ -99,7 +99,7 @@ namespace sh ...@@ -99,7 +99,7 @@ namespace sh
this->registerIndex = registerIndex; this->registerIndex = registerIndex;
} }
OutputASM::OutputASM(TParseContext &context, es2::Shader *shaderObject) : TIntermTraverser(true, true, true), mContext(context), shaderObject(shaderObject) OutputASM::OutputASM(TParseContext &context, rad::Shader *shaderObject) : TIntermTraverser(true, true, true), mContext(context), shaderObject(shaderObject)
{ {
shader = 0; shader = 0;
pixelShader = 0; pixelShader = 0;
...@@ -2003,10 +2003,10 @@ namespace sh ...@@ -2003,10 +2003,10 @@ namespace sh
{ {
const TType &type = varying->getType(); const TType &type = varying->getType();
const char *name = varying->getAsSymbolNode()->getSymbol().c_str(); const char *name = varying->getAsSymbolNode()->getSymbol().c_str();
es2::VaryingList &activeVaryings = shaderObject->varyings; rad::VaryingList &activeVaryings = shaderObject->varyings;
// Check if this varying has been declared before without having a register assigned // Check if this varying has been declared before without having a register assigned
for(es2::VaryingList::iterator v = activeVaryings.begin(); v != activeVaryings.end(); v++) for(rad::VaryingList::iterator v = activeVaryings.begin(); v != activeVaryings.end(); v++)
{ {
if(v->name == name) if(v->name == name)
{ {
...@@ -2020,7 +2020,7 @@ namespace sh ...@@ -2020,7 +2020,7 @@ namespace sh
} }
} }
activeVaryings.push_back(es2::Varying(glVariableType(type), name, varying->getArraySize(), reg, 0)); activeVaryings.push_back(rad::Varying(glVariableType(type), name, varying->getArraySize(), reg, 0));
} }
} }
......
src/Radiance/compiler/OutputASM.h
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <set> #include <set>
#include <map> #include <map>
namespace es2 namespace rad
{ {
class Shader; class Shader;
} }
...@@ -81,7 +81,7 @@ namespace sh ...@@ -81,7 +81,7 @@ namespace sh
class OutputASM : public TIntermTraverser class OutputASM : public TIntermTraverser
{ {
public: public:
explicit OutputASM(TParseContext &context, es2::Shader *shaderObject); explicit OutputASM(TParseContext &context, rad::Shader *shaderObject);
~OutputASM(); ~OutputASM();
void output(); void output();
...@@ -144,7 +144,7 @@ namespace sh ...@@ -144,7 +144,7 @@ namespace sh
static int dim2(TIntermNode *m); static int dim2(TIntermNode *m);
static unsigned int loopCount(TIntermLoop *node); static unsigned int loopCount(TIntermLoop *node);
es2::Shader *const shaderObject; rad::Shader *const shaderObject;
sw::Shader *shader; sw::Shader *shader;
sw::PixelShader *pixelShader; sw::PixelShader *pixelShader;
sw::VertexShader *vertexShader; sw::VertexShader *vertexShader;
......
src/Radiance/compiler/TranslatorASM.cpp
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "InitializeParseContext.h" #include "InitializeParseContext.h"
TranslatorASM::TranslatorASM(es2::Shader *shaderObject, ShShaderType type, ShShaderSpec spec) : TCompiler(type, spec), shaderObject(shaderObject) TranslatorASM::TranslatorASM(rad::Shader *shaderObject, ShShaderType type, ShShaderSpec spec) : TCompiler(type, spec), shaderObject(shaderObject)
{ {
} }
......
src/Radiance/compiler/TranslatorASM.h
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include "Shader/PixelShader.hpp" #include "Shader/PixelShader.hpp"
#include "Shader/VertexShader.hpp" #include "Shader/VertexShader.hpp"
namespace es2 namespace rad
{ {
class Shader; class Shader;
} }
...@@ -25,13 +25,13 @@ namespace es2 ...@@ -25,13 +25,13 @@ namespace es2
class TranslatorASM : public TCompiler class TranslatorASM : public TCompiler
{ {
public: public:
TranslatorASM(es2::Shader *shaderObject, ShShaderType type, ShShaderSpec spec); TranslatorASM(rad::Shader *shaderObject, ShShaderType type, ShShaderSpec spec);
protected: protected:
virtual bool translate(TIntermNode* root); virtual bool translate(TIntermNode* root);
private: private:
es2::Shader *const shaderObject; rad::Shader *const shaderObject;
}; };
#endif // COMPILER_TRANSLATORASM_H_ #endif // COMPILER_TRANSLATORASM_H_
src/Radiance/compiler/preprocessor/preprocessor.vcxproj
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}</ProjectGuid> <ProjectGuid>{6303975E-7060-4CE7-8090-CB2DE0B840B4}</ProjectGuid>
<RootNamespace>preprocessor</RootNamespace> <RootNamespace>preprocessor</RootNamespace>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
......
src/Radiance/libEGL/Display.cpp
...@@ -388,18 +388,11 @@ EGLContext Display::createContext(EGLConfig configHandle, const egl::Context *sh ...@@ -388,18 +388,11 @@ EGLContext Display::createContext(EGLConfig configHandle, const egl::Context *sh
const egl::Config *config = mConfigSet.get(configHandle); const egl::Config *config = mConfigSet.get(configHandle);
egl::Context *context = 0; egl::Context *context = 0;
if(clientVersion == 1 && config->mRenderableType & EGL_OPENGL_ES_BIT) if(clientVersion == 2 && config->mRenderableType & EGL_OPENGL_ES2_BIT)
{ {
if(es1::createContext != 0) if(rad::createContext != 0)
{ {
context = es1::createContext(config, shareContext); context = rad::createContext(config, shareContext);
}
}
else if(clientVersion == 2 && config->mRenderableType & EGL_OPENGL_ES2_BIT)
{
if(es2::createContext != 0)
{
context = es2::createContext(config, shareContext);
} }
} }
else else
......
src/Radiance/libEGL/Surface.cpp
...@@ -132,7 +132,7 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight) ...@@ -132,7 +132,7 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight)
if(mWindow) if(mWindow)
{ {
frameBuffer = es::createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight); frameBuffer = rad::createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight);
if(!frameBuffer) if(!frameBuffer)
{ {
...@@ -142,7 +142,7 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight) ...@@ -142,7 +142,7 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight)
} }
} }
backBuffer = es::createBackBuffer(backBufferWidth, backBufferHeight, mConfig); backBuffer = rad::createBackBuffer(backBufferWidth, backBufferHeight, mConfig);
if(!backBuffer) if(!backBuffer)
{ {
...@@ -153,7 +153,7 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight) ...@@ -153,7 +153,7 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight)
if(mConfig->mDepthStencilFormat != sw::FORMAT_NULL) if(mConfig->mDepthStencilFormat != sw::FORMAT_NULL)
{ {
mDepthStencil = es::createDepthStencil(backBufferWidth, backBufferHeight, mConfig->mDepthStencilFormat, 1, false); mDepthStencil = rad::createDepthStencil(backBufferWidth, backBufferHeight, mConfig->mDepthStencilFormat, 1, false);
if(!mDepthStencil) if(!mDepthStencil)
{ {
......
src/Radiance/libEGL/libEGL.cpp
...@@ -1207,15 +1207,9 @@ __eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const cha ...@@ -1207,15 +1207,9 @@ __eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const cha
} }
} }
if(es2::getProcAddress != 0) if(rad::getProcAddress != 0)
{ {
__eglMustCastToProperFunctionPointerType proc = es2::getProcAddress(procname); __eglMustCastToProperFunctionPointerType proc = rad::getProcAddress(procname);
if(proc) return proc;
}
if(es1::getProcAddress != 0)
{
__eglMustCastToProperFunctionPointerType proc = es1::getProcAddress(procname);
if(proc) return proc; if(proc) return proc;
} }
} }
......
src/Radiance/libEGL/libEGL.vcxproj
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}</ProjectGuid> <ProjectGuid>{2F6770B5-F168-4FCD-8A56-4DD95BEC8893}</ProjectGuid>
<RootNamespace>libEGL</RootNamespace> <RootNamespace>libEGL</RootNamespace>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
</PropertyGroup> </PropertyGroup>
......
src/Radiance/libEGL/main.cpp
...@@ -84,37 +84,19 @@ CONSTRUCTOR static bool eglAttachProcess() ...@@ -84,37 +84,19 @@ CONSTRUCTOR static bool eglAttachProcess()
eglAttachThread(); eglAttachThread();
#if defined(_WIN32) #if defined(_WIN32)
const char *libGLES_CM_lib = "libGLES_CM.dll"; const char *libRAD_lib = "libRAD.dll";
#else #else
const char *libGLES_CM_lib = "libGLES_CM.so.1"; const char *libRAD_lib = "libRAD.so";
#endif #endif
libGLES_CM = loadLibrary(libGLES_CM_lib); libRAD = loadLibrary(libRAD_lib);
es1::createContext = (egl::Context *(*)(const egl::Config*, const egl::Context*))getProcAddress(libGLES_CM, "glCreateContext"); rad::createContext = (egl::Context *(*)(const egl::Config*, const egl::Context*))getProcAddress(libRAD, "glCreateContext");
es1::getProcAddress = (__eglMustCastToProperFunctionPointerType (*)(const char*))getProcAddress(libGLES_CM, "glGetProcAddress"); rad::getProcAddress = (__eglMustCastToProperFunctionPointerType (*)(const char*))getProcAddress(libRAD, "glGetProcAddress");
rad::createBackBuffer = (egl::Image *(*)(int, int, const egl::Config*))getProcAddress(libRAD, "createBackBuffer");
#if defined(_WIN32) rad::createDepthStencil = (egl::Image *(*)(unsigned int, unsigned int, sw::Format, int, bool))getProcAddress(libRAD, "createDepthStencil");
const char *libGLESv2_lib = "libGLESv2.dll"; rad::createFrameBuffer = (sw::FrameBuffer *(*)(EGLNativeDisplayType, EGLNativeWindowType, int, int))getProcAddress(libRAD, "createFrameBuffer");
#else
const char *libGLESv2_lib = "libGLESv2.so.2"; return libRAD != 0;
#endif
libGLESv2 = loadLibrary(libGLESv2_lib);
es2::createContext = (egl::Context *(*)(const egl::Config*, const egl::Context*))getProcAddress(libGLESv2, "glCreateContext");
es2::getProcAddress = (__eglMustCastToProperFunctionPointerType (*)(const char*))getProcAddress(libGLESv2, "glGetProcAddress");
es::createBackBuffer = (egl::Image *(*)(int, int, const egl::Config*))getProcAddress(libGLES_CM, "createBackBuffer");
es::createDepthStencil = (egl::Image *(*)(unsigned int, unsigned int, sw::Format, int, bool))getProcAddress(libGLES_CM, "createDepthStencil");
es::createFrameBuffer = (sw::FrameBuffer *(*)(EGLNativeDisplayType, EGLNativeWindowType, int, int))getProcAddress(libGLES_CM, "createFrameBuffer");
if(!es::createBackBuffer)
{
es::createBackBuffer = (egl::Image *(*)(int, int, const egl::Config*))getProcAddress(libGLESv2, "createBackBuffer");
es::createDepthStencil = (egl::Image *(*)(unsigned int, unsigned int, sw::Format, int, bool))getProcAddress(libGLESv2, "createDepthStencil");
es::createFrameBuffer = (sw::FrameBuffer *(*)(EGLNativeDisplayType, EGLNativeWindowType, int, int))getProcAddress(libGLESv2, "createFrameBuffer");
}
return libGLES_CM != 0 || libGLESv2 != 0;
} }
DESTRUCTOR static void eglDetachProcess() DESTRUCTOR static void eglDetachProcess()
...@@ -123,7 +105,7 @@ DESTRUCTOR static void eglDetachProcess() ...@@ -123,7 +105,7 @@ DESTRUCTOR static void eglDetachProcess()
eglDetachThread(); eglDetachThread();
sw::Thread::freeLocalStorageKey(currentTLS); sw::Thread::freeLocalStorageKey(currentTLS);
freeLibrary(libGLESv2); freeLibrary(libRAD);
} }
#if defined(_WIN32) #if defined(_WIN32)
...@@ -318,24 +300,14 @@ void error(EGLint errorCode) ...@@ -318,24 +300,14 @@ void error(EGLint errorCode)
} }
} }
namespace es1 namespace rad
{
egl::Context *(*createContext)(const egl::Config *config, const egl::Context *shareContext) = 0;
__eglMustCastToProperFunctionPointerType (*getProcAddress)(const char *procname) = 0;
}
namespace es2
{ {
egl::Context *(*createContext)(const egl::Config *config, const egl::Context *shareContext) = 0; egl::Context *(*createContext)(const egl::Config *config, const egl::Context *shareContext) = 0;
__eglMustCastToProperFunctionPointerType (*getProcAddress)(const char *procname) = 0; __eglMustCastToProperFunctionPointerType (*getProcAddress)(const char *procname) = 0;
}
namespace es
{
egl::Image *(*createBackBuffer)(int width, int height, const egl::Config *config) = 0; egl::Image *(*createBackBuffer)(int width, int height, const egl::Config *config) = 0;
egl::Image *(*createDepthStencil)(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard) = 0; egl::Image *(*createDepthStencil)(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard) = 0;
sw::FrameBuffer *(*createFrameBuffer)(EGLNativeDisplayType display, EGLNativeWindowType window, int width, int height) = 0; sw::FrameBuffer *(*createFrameBuffer)(EGLNativeDisplayType display, EGLNativeWindowType window, int width, int height) = 0;
} }
void *libGLES_CM = 0; // Handle to the libGLES_CM module void *libRAD = 0; // Handle to the libRAD module
void *libGLESv2 = 0; // Handle to the libGLESv2 module
src/Radiance/libEGL/main.h
...@@ -82,28 +82,17 @@ namespace sw ...@@ -82,28 +82,17 @@ namespace sw
enum Format : unsigned char; enum Format : unsigned char;
} }
// libGLES_CM dependencies // libRAD dependencies
namespace es1 namespace rad
{ {
extern egl::Context *(*createContext)(const egl::Config *config, const egl::Context *shareContext); extern egl::Context *(*createContext)(const egl::Config *config, const egl::Context *shareContext);
extern __eglMustCastToProperFunctionPointerType (*getProcAddress)(const char *procname); 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 *(*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 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 sw::FrameBuffer *(*createFrameBuffer)(EGLNativeDisplayType display, EGLNativeWindowType window, int width, int height);
} }
extern void *libGLES_CM; // Handle to the libGLES_CM module extern void *libRAD; // Handle to the libRAD module
extern void *libGLESv2; // Handle to the libGLESv2 module
#endif // LIBEGL_MAIN_H_ #endif // LIBEGL_MAIN_H_
src/Radiance/libRAD/Buffer.cpp
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "VertexDataManager.h" #include "VertexDataManager.h"
#include "IndexDataManager.h" #include "IndexDataManager.h"
namespace es2 namespace rad
{ {
Buffer::Buffer(GLuint id) : RefCountObject(id) Buffer::Buffer(GLuint id) : RefCountObject(id)
......
src/Radiance/libRAD/Buffer.h
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <cstddef> #include <cstddef>
#include <vector> #include <vector>
namespace es2 namespace rad
{ {
class Buffer : public RefCountObject class Buffer : public RefCountObject
{ {
......
src/Radiance/libRAD/Context.h
...@@ -38,7 +38,7 @@ class Surface; ...@@ -38,7 +38,7 @@ class Surface;
class Config; class Config;
} }
namespace es2 namespace rad
{ {
struct TranslatedAttribute; struct TranslatedAttribute;
struct TranslatedIndexData; struct TranslatedIndexData;
......
src/Radiance/libRAD/Device.cpp
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
bool localShaderConstants = false; bool localShaderConstants = false;
namespace es2 namespace rad
{ {
using namespace sw; using namespace sw;
......
src/Radiance/libRAD/Device.hpp
...@@ -19,7 +19,7 @@ namespace egl ...@@ -19,7 +19,7 @@ namespace egl
class Image; class Image;
} }
namespace es2 namespace rad
{ {
class Texture; class Texture;
class Image; class Image;
......
src/Radiance/libRAD/Fence.cpp
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "main.h" #include "main.h"
#include "Common/Thread.hpp" #include "Common/Thread.hpp"
namespace es2 namespace rad
{ {
Fence::Fence() Fence::Fence()
......
src/Radiance/libRAD/Fence.h
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#define GL_APICALL #define GL_APICALL
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
namespace es2 namespace rad
{ {
class Fence class Fence
......
src/Radiance/libRAD/Framebuffer.cpp
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "Texture.h" #include "Texture.h"
#include "utilities.h" #include "utilities.h"
namespace es2 namespace rad
{ {
Framebuffer::Framebuffer() Framebuffer::Framebuffer()
...@@ -245,7 +245,7 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples) ...@@ -245,7 +245,7 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples)
if(mColorbufferType == GL_RENDERBUFFER) if(mColorbufferType == GL_RENDERBUFFER)
{ {
if(!es2::IsColorRenderable(colorbuffer->getFormat())) if(!rad::IsColorRenderable(colorbuffer->getFormat()))
{ {
return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT; return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
} }
...@@ -262,7 +262,7 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples) ...@@ -262,7 +262,7 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples)
return GL_FRAMEBUFFER_UNSUPPORTED; return GL_FRAMEBUFFER_UNSUPPORTED;
} }
if(es2::IsDepthTexture(format) || es2::IsStencilTexture(format)) if(rad::IsDepthTexture(format) || rad::IsStencilTexture(format))
{ {
return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT; return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
} }
...@@ -297,14 +297,14 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples) ...@@ -297,14 +297,14 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples)
if(mDepthbufferType == GL_RENDERBUFFER) if(mDepthbufferType == GL_RENDERBUFFER)
{ {
if(!es2::IsDepthRenderable(depthbuffer->getFormat())) if(!rad::IsDepthRenderable(depthbuffer->getFormat()))
{ {
return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT; return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
} }
} }
else if(IsTextureTarget(mDepthbufferType)) else if(IsTextureTarget(mDepthbufferType))
{ {
if(!es2::IsDepthTexture(depthbuffer->getFormat())) if(!rad::IsDepthTexture(depthbuffer->getFormat()))
{ {
return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT; return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
} }
...@@ -347,7 +347,7 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples) ...@@ -347,7 +347,7 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples)
if(mStencilbufferType == GL_RENDERBUFFER) if(mStencilbufferType == GL_RENDERBUFFER)
{ {
if(!es2::IsStencilRenderable(stencilbuffer->getFormat())) if(!rad::IsStencilRenderable(stencilbuffer->getFormat()))
{ {
return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT; return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
} }
...@@ -356,7 +356,7 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples) ...@@ -356,7 +356,7 @@ GLenum Framebuffer::completeness(int &width, int &height, int &samples)
{ {
GLenum internalformat = stencilbuffer->getFormat(); GLenum internalformat = stencilbuffer->getFormat();
if(!es2::IsStencilTexture(internalformat)) if(!rad::IsStencilTexture(internalformat))
{ {
return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT; return GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT;
} }
......
src/Radiance/libRAD/Framebuffer.h
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define GL_APICALL #define GL_APICALL
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
namespace es2 namespace rad
{ {
class Renderbuffer; class Renderbuffer;
class Colorbuffer; class Colorbuffer;
......
src/Radiance/libRAD/HandleAllocator.cpp
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "main.h" #include "main.h"
namespace es2 namespace rad
{ {
HandleAllocator::HandleAllocator() : mBaseValue(1), mNextValue(1) HandleAllocator::HandleAllocator() : mBaseValue(1), mNextValue(1)
......
src/Radiance/libRAD/HandleAllocator.h
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <vector> #include <vector>
namespace es2 namespace rad
{ {
class HandleAllocator class HandleAllocator
......
src/Radiance/libRAD/Image.cpp
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
namespace es2 namespace rad
{ {
static sw::Resource *getParentResource(Texture *texture) static sw::Resource *getParentResource(Texture *texture)
{ {
......
src/Radiance/libRAD/Image.hpp
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#define GL_APICALL #define GL_APICALL
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
namespace es2 namespace rad
{ {
class Texture; class Texture;
......
src/Radiance/libRAD/IndexDataManager.cpp
...@@ -25,7 +25,7 @@ namespace ...@@ -25,7 +25,7 @@ namespace
enum { INITIAL_INDEX_BUFFER_SIZE = 4096 * sizeof(GLuint) }; enum { INITIAL_INDEX_BUFFER_SIZE = 4096 * sizeof(GLuint) };
} }
namespace es2 namespace rad
{ {
IndexDataManager::IndexDataManager() IndexDataManager::IndexDataManager()
......
src/Radiance/libRAD/IndexDataManager.h
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define GL_APICALL #define GL_APICALL
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
namespace es2 namespace rad
{ {
struct TranslatedIndexData struct TranslatedIndexData
......
src/Radiance/libRAD/Program.cpp
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <string> #include <string>
#include <stdlib.h> #include <stdlib.h>
namespace es2 namespace rad
{ {
unsigned int Program::currentSerial = 1; unsigned int Program::currentSerial = 1;
......
src/Radiance/libRAD/Program.h
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <vector> #include <vector>
#include <set> #include <set>
namespace es2 namespace rad
{ {
class Device; class Device;
class ResourceManager; class ResourceManager;
...@@ -163,7 +163,7 @@ namespace es2 ...@@ -163,7 +163,7 @@ namespace es2
static unsigned int issueSerial(); static unsigned int issueSerial();
private: private:
es2::Device *device; rad::Device *device;
FragmentShader *fragmentShader; FragmentShader *fragmentShader;
VertexShader *vertexShader; VertexShader *vertexShader;
......
src/Radiance/libRAD/Query.cpp
...@@ -9,14 +9,14 @@ ...@@ -9,14 +9,14 @@
// or implied, including but not limited to any patent rights, are granted to you. // or implied, including but not limited to any patent rights, are granted to you.
// //
// Query.cpp: Implements the es2::Query class // Query.cpp: Implements the rad::Query class
#include "Query.h" #include "Query.h"
#include "main.h" #include "main.h"
#include "Common/Thread.hpp" #include "Common/Thread.hpp"
namespace es2 namespace rad
{ {
Query::Query(GLuint id, GLenum type) : RefCountObject(id) Query::Query(GLuint id, GLenum type) : RefCountObject(id)
......
src/Radiance/libRAD/Query.h
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
// or implied, including but not limited to any patent rights, are granted to you. // or implied, including but not limited to any patent rights, are granted to you.
// //
// Query.h: Defines the es2::Query class // Query.h: Defines the rad::Query class
#ifndef LIBGLESV2_QUERY_H_ #ifndef LIBGLESV2_QUERY_H_
#define LIBGLESV2_QUERY_H_ #define LIBGLESV2_QUERY_H_
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define GL_APICALL #define GL_APICALL
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
namespace es2 namespace rad
{ {
class Query : public RefCountObject class Query : public RefCountObject
......
src/Radiance/libRAD/RefCountObject.cpp
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "Common/Thread.hpp" #include "Common/Thread.hpp"
namespace es2 namespace rad
{ {
RefCountObject::RefCountObject(GLuint id) RefCountObject::RefCountObject(GLuint id)
......
src/Radiance/libRAD/RefCountObject.h
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <cstddef> #include <cstddef>
namespace es2 namespace rad
{ {
class RefCountObject class RefCountObject
......
src/Radiance/libRAD/Renderbuffer.cpp
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "Texture.h" #include "Texture.h"
#include "utilities.h" #include "utilities.h"
namespace es2 namespace rad
{ {
RenderbufferInterface::RenderbufferInterface() RenderbufferInterface::RenderbufferInterface()
{ {
...@@ -38,32 +38,32 @@ void RenderbufferInterface::releaseProxy(const Renderbuffer *proxy) ...@@ -38,32 +38,32 @@ void RenderbufferInterface::releaseProxy(const Renderbuffer *proxy)
GLuint RenderbufferInterface::getRedSize() const GLuint RenderbufferInterface::getRedSize() const
{ {
return sw2es::GetRedSize(getInternalFormat()); return sw2rad::GetRedSize(getInternalFormat());
} }
GLuint RenderbufferInterface::getGreenSize() const GLuint RenderbufferInterface::getGreenSize() const
{ {
return sw2es::GetGreenSize(getInternalFormat()); return sw2rad::GetGreenSize(getInternalFormat());
} }
GLuint RenderbufferInterface::getBlueSize() const GLuint RenderbufferInterface::getBlueSize() const
{ {
return sw2es::GetBlueSize(getInternalFormat()); return sw2rad::GetBlueSize(getInternalFormat());
} }
GLuint RenderbufferInterface::getAlphaSize() const GLuint RenderbufferInterface::getAlphaSize() const
{ {
return sw2es::GetAlphaSize(getInternalFormat()); return sw2rad::GetAlphaSize(getInternalFormat());
} }
GLuint RenderbufferInterface::getDepthSize() const GLuint RenderbufferInterface::getDepthSize() const
{ {
return sw2es::GetDepthSize(getInternalFormat()); return sw2rad::GetDepthSize(getInternalFormat());
} }
GLuint RenderbufferInterface::getStencilSize() const GLuint RenderbufferInterface::getStencilSize() const
{ {
return sw2es::GetStencilSize(getInternalFormat()); return sw2rad::GetStencilSize(getInternalFormat());
} }
///// RenderbufferTexture2D Implementation //////// ///// RenderbufferTexture2D Implementation ////////
...@@ -360,7 +360,7 @@ Colorbuffer::Colorbuffer(egl::Image *renderTarget) : mRenderTarget(renderTarget) ...@@ -360,7 +360,7 @@ Colorbuffer::Colorbuffer(egl::Image *renderTarget) : mRenderTarget(renderTarget)
mWidth = renderTarget->getWidth(); mWidth = renderTarget->getWidth();
mHeight = renderTarget->getHeight(); mHeight = renderTarget->getHeight();
internalFormat = renderTarget->getInternalFormat(); internalFormat = renderTarget->getInternalFormat();
format = sw2es::ConvertBackBufferFormat(internalFormat); format = sw2rad::ConvertBackBufferFormat(internalFormat);
mSamples = renderTarget->getMultiSampleDepth() & ~1; mSamples = renderTarget->getMultiSampleDepth() & ~1;
} }
} }
...@@ -369,7 +369,7 @@ Colorbuffer::Colorbuffer(int width, int height, GLenum format, GLsizei samples) ...@@ -369,7 +369,7 @@ Colorbuffer::Colorbuffer(int width, int height, GLenum format, GLsizei samples)
{ {
Device *device = getDevice(); Device *device = getDevice();
sw::Format requestedFormat = es2sw::ConvertRenderbufferFormat(format); sw::Format requestedFormat = rad2sw::ConvertRenderbufferFormat(format);
int supportedSamples = Context::getSupportedMultiSampleDepth(requestedFormat, samples); int supportedSamples = Context::getSupportedMultiSampleDepth(requestedFormat, samples);
if(width > 0 && height > 0) if(width > 0 && height > 0)
...@@ -437,7 +437,7 @@ DepthStencilbuffer::DepthStencilbuffer(egl::Image *depthStencil) : mDepthStencil ...@@ -437,7 +437,7 @@ DepthStencilbuffer::DepthStencilbuffer(egl::Image *depthStencil) : mDepthStencil
mWidth = depthStencil->getWidth(); mWidth = depthStencil->getWidth();
mHeight = depthStencil->getHeight(); mHeight = depthStencil->getHeight();
internalFormat = depthStencil->getInternalFormat(); internalFormat = depthStencil->getInternalFormat();
format = sw2es::ConvertDepthStencilFormat(internalFormat); format = sw2rad::ConvertDepthStencilFormat(internalFormat);
mSamples = depthStencil->getMultiSampleDepth() & ~1; mSamples = depthStencil->getMultiSampleDepth() & ~1;
} }
} }
......
src/Radiance/libRAD/Renderbuffer.h
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#define GL_APICALL #define GL_APICALL
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
namespace es2 namespace rad
{ {
class Texture2D; class Texture2D;
class TextureCubeMap; class TextureCubeMap;
......
src/Radiance/libRAD/ResourceManager.cpp
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include "Shader.h" #include "Shader.h"
#include "Texture.h" #include "Texture.h"
namespace es2 namespace rad
{ {
ResourceManager::ResourceManager() ResourceManager::ResourceManager()
{ {
......
src/Radiance/libRAD/ResourceManager.h
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <map> #include <map>
namespace es2 namespace rad
{ {
class Buffer; class Buffer;
class Shader; class Shader;
......
src/Radiance/libRAD/Shader.cpp
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <string> #include <string>
namespace es2 namespace rad
{ {
Shader::Shader(ResourceManager *manager, GLuint handle) : mHandle(handle), mResourceManager(manager) Shader::Shader(ResourceManager *manager, GLuint handle) : mHandle(handle), mResourceManager(manager)
{ {
......
src/Radiance/libRAD/Shader.h
...@@ -32,7 +32,7 @@ namespace sh ...@@ -32,7 +32,7 @@ namespace sh
class OutputASM; class OutputASM;
} }
namespace es2 namespace rad
{ {
struct Varying struct Varying
{ {
...@@ -46,7 +46,7 @@ struct Varying ...@@ -46,7 +46,7 @@ struct Varying
return arraySize >= 1; return arraySize >= 1;
} }
int size() const // Unify with es2::Uniform? int size() const // Unify with rad::Uniform?
{ {
return arraySize > 0 ? arraySize : 1; return arraySize > 0 ? arraySize : 1;
} }
......
src/Radiance/libRAD/Texture.cpp
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <algorithm> #include <algorithm>
namespace es2 namespace rad
{ {
Texture::Texture(GLuint id) : RefCountObject(id) Texture::Texture(GLuint id) : RefCountObject(id)
...@@ -1156,17 +1156,17 @@ void TextureExternal::setImage(Image *sharedImage) ...@@ -1156,17 +1156,17 @@ void TextureExternal::setImage(Image *sharedImage)
// Exported functions for use by EGL // Exported functions for use by EGL
extern "C" extern "C"
{ {
es2::Image *createBackBuffer(int width, int height, const egl::Config *config) rad::Image *createBackBuffer(int width, int height, const egl::Config *config)
{ {
if(config) if(config)
{ {
return new es2::Image(0, width, height, config->mAlphaSize ? GL_RGBA : GL_RGB, GL_UNSIGNED_BYTE); return new rad::Image(0, width, height, config->mAlphaSize ? GL_RGBA : GL_RGB, GL_UNSIGNED_BYTE);
} }
return 0; return 0;
} }
es2::Image *createDepthStencil(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard) rad::Image *createDepthStencil(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard)
{ {
if(width == 0 || height == 0 || height > OUTLINE_RESOLUTION) if(width == 0 || height == 0 || height > OUTLINE_RESOLUTION)
{ {
...@@ -1199,7 +1199,7 @@ extern "C" ...@@ -1199,7 +1199,7 @@ extern "C"
UNREACHABLE(); UNREACHABLE();
} }
es2::Image *surface = new es2::Image(0, width, height, format, multiSampleDepth, lockable, true); rad::Image *surface = new rad::Image(0, width, height, format, multiSampleDepth, lockable, true);
if(!surface) if(!surface)
{ {
......
src/Radiance/libRAD/Texture.h
...@@ -33,7 +33,7 @@ class Surface; ...@@ -33,7 +33,7 @@ class Surface;
class Config; class Config;
} }
namespace es2 namespace rad
{ {
class Framebuffer; class Framebuffer;
......
src/Radiance/libRAD/VertexDataManager.cpp
...@@ -24,7 +24,7 @@ namespace ...@@ -24,7 +24,7 @@ namespace
enum {INITIAL_STREAM_BUFFER_SIZE = 1024 * 1024}; enum {INITIAL_STREAM_BUFFER_SIZE = 1024 * 1024};
} }
namespace es2 namespace rad
{ {
VertexDataManager::VertexDataManager(Context *context) : mContext(context) VertexDataManager::VertexDataManager(Context *context) : mContext(context)
......
src/Radiance/libRAD/VertexDataManager.h
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define GL_APICALL #define GL_APICALL
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
namespace es2 namespace rad
{ {
struct TranslatedAttribute struct TranslatedAttribute
......
src/Radiance/libRAD/libGLESv2.rc → src/Radiance/libRAD/libRAD.rc
// Microsoft Visual C++ generated resource script. // Microsoft Visual C++ generated resource script.
// //
#include "resource.h" #include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS #define APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Generated from the TEXTINCLUDE 2 resource. // Generated from the TEXTINCLUDE 2 resource.
// //
#include <windows.h> #include <windows.h>
#include "../../common/Version.h" #include "../../common/Version.h"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS #undef APSTUDIO_READONLY_SYMBOLS
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources // English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32 #ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252) #pragma code_page(1252)
#endif //_WIN32 #endif //_WIN32
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// TEXTINCLUDE // TEXTINCLUDE
// //
1 TEXTINCLUDE 1 TEXTINCLUDE
BEGIN BEGIN
"resource.h\0" "resource.h\0"
END END
2 TEXTINCLUDE 2 TEXTINCLUDE
BEGIN BEGIN
"#include ""afxres.h""\r\n" "#include ""afxres.h""\r\n"
"#include ""../common/version.h""\0" "#include ""../common/version.h""\0"
END END
3 TEXTINCLUDE 3 TEXTINCLUDE
BEGIN BEGIN
"\r\n" "\r\n"
"\0" "\0"
END END
#endif // APSTUDIO_INVOKED #endif // APSTUDIO_INVOKED
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Version // Version
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION FILEVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION
PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION PRODUCTVERSION MAJOR_VERSION,MINOR_VERSION,BUILD_VERSION,BUILD_REVISION
FILEFLAGSMASK 0x17L FILEFLAGSMASK 0x17L
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
#else #else
FILEFLAGS 0x0L FILEFLAGS 0x0L
#endif #endif
FILEOS 0x4L FILEOS 0x4L
FILETYPE 0x2L FILETYPE 0x2L
FILESUBTYPE 0x0L FILESUBTYPE 0x0L
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "FileDescription", "SwiftShader libGLESv2 Dynamic Link Library" VALUE "FileDescription", "SwiftShader libGLESv2 Dynamic Link Library"
VALUE "FileVersion", VERSION_STRING VALUE "FileVersion", VERSION_STRING
VALUE "InternalName", "libGLESv2" VALUE "InternalName", "libGLESv2"
VALUE "LegalCopyright", "Copyright (C) 2012 TransGaming Inc." VALUE "LegalCopyright", "Copyright (C) 2012 TransGaming Inc."
VALUE "OriginalFilename", "libGLESv2.dll" VALUE "OriginalFilename", "libGLESv2.dll"
VALUE "PrivateBuild", VERSION_STRING VALUE "PrivateBuild", VERSION_STRING
VALUE "ProductName", "SwiftShader libGLESv2 Dynamic Link Library" VALUE "ProductName", "SwiftShader libGLESv2 Dynamic Link Library"
VALUE "ProductVersion", VERSION_STRING VALUE "ProductVersion", VERSION_STRING
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
BEGIN BEGIN
VALUE "Translation", 0x409, 1200 VALUE "Translation", 0x409, 1200
END END
END END
#endif // English (U.S.) resources #endif // English (U.S.) resources
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED #ifndef APSTUDIO_INVOKED
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// //
// Generated from the TEXTINCLUDE 3 resource. // Generated from the TEXTINCLUDE 3 resource.
// //
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED #endif // not APSTUDIO_INVOKED
src/Radiance/libRAD/libGLESv2.vcxproj → src/Radiance/libRAD/libRAD.vcxproj
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32"> <ProjectConfiguration Include="Debug|Win32">
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{B5871A7A-968C-42E3-A33B-981E6F448E78}</ProjectGuid> <ProjectGuid>{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}</ProjectGuid>
<RootNamespace>libGLESv2</RootNamespace> <RootNamespace>libRAD</RootNamespace>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
...@@ -84,14 +84,14 @@ ...@@ -84,14 +84,14 @@
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile> <ModuleDefinitionFile>libRAD.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)\" <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)\"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command> copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
...@@ -115,7 +115,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com ...@@ -115,7 +115,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
<Link> <Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile> <ModuleDefinitionFile>libRAD.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
...@@ -124,7 +124,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com ...@@ -124,7 +124,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)\" <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)\"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command> copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
...@@ -147,7 +147,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com ...@@ -147,7 +147,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
<Link> <Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile> <ModuleDefinitionFile>libRAD.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
...@@ -156,7 +156,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com ...@@ -156,7 +156,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
</Link> </Link>
<PostBuildEvent> <PostBuildEvent>
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)\" <Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)\"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command> copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
...@@ -169,7 +169,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com ...@@ -169,7 +169,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
<ClCompile Include="HandleAllocator.cpp" /> <ClCompile Include="HandleAllocator.cpp" />
<ClCompile Include="Image.cpp" /> <ClCompile Include="Image.cpp" />
<ClCompile Include="IndexDataManager.cpp" /> <ClCompile Include="IndexDataManager.cpp" />
<ClCompile Include="libGLESv2.cpp" /> <ClCompile Include="libRAD.cpp" />
<ClCompile Include="main.cpp" /> <ClCompile Include="main.cpp" />
<ClCompile Include="Program.cpp" /> <ClCompile Include="Program.cpp" />
<ClCompile Include="Query.cpp" /> <ClCompile Include="Query.cpp" />
...@@ -208,10 +208,10 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com ...@@ -208,10 +208,10 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
<ClInclude Include="VertexDataManager.h" /> <ClInclude Include="VertexDataManager.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="libGLESv2.def" /> <None Include="libRAD.def" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="libGLESv2.rc" /> <ResourceCompile Include="libRAD.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\SwiftShader\SwiftShader.vcxproj"> <ProjectReference Include="..\..\SwiftShader\SwiftShader.vcxproj">
...@@ -223,10 +223,10 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com ...@@ -223,10 +223,10 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs> <UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\compiler\Compiler.vcxproj"> <ProjectReference Include="..\compiler\Compiler.vcxproj">
<Project>{5b3a6db8-1e7e-40d7-92b9-da8aae619fad}</Project> <Project>{5aebf8b8-3454-4984-9d77-a8f13bc0377b}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>
\ No newline at end of file
src/Radiance/libRAD/libGLESv2.vcxproj.filters → src/Radiance/libRAD/libRAD.vcxproj.filters
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<Filter Include="Source Files"> <Filter Include="Source Files">
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<ClCompile Include="IndexDataManager.cpp"> <ClCompile Include="IndexDataManager.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="libGLESv2.cpp"> <ClCompile Include="libRAD.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="main.cpp"> <ClCompile Include="main.cpp">
...@@ -147,9 +147,9 @@ ...@@ -147,9 +147,9 @@
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="libGLESv2.rc" /> <ResourceCompile Include="libRAD.rc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="libGLESv2.def" /> <None Include="libRAD.def" />
</ItemGroup> </ItemGroup>
</Project> </Project>
\ No newline at end of file
src/Radiance/libRAD/main.cpp
...@@ -53,15 +53,6 @@ CONSTRUCTOR static bool glAttachProcess() ...@@ -53,15 +53,6 @@ CONSTRUCTOR static bool glAttachProcess()
egl::getCurrentContext = (egl::Context *(*)())getProcAddress(libEGL, "eglGetCurrentContext"); egl::getCurrentContext = (egl::Context *(*)())getProcAddress(libEGL, "eglGetCurrentContext");
egl::getCurrentDisplay = (egl::Display *(*)())getProcAddress(libEGL, "eglGetCurrentDisplay"); egl::getCurrentDisplay = (egl::Display *(*)())getProcAddress(libEGL, "eglGetCurrentDisplay");
#if defined(_WIN32)
const char *libGLES_CM_lib = "libGLES_CM.dll";
#else
const char *libGLES_CM_lib = "libGLES_CM.so.1";
#endif
libGLES_CM = loadLibrary(libGLES_CM_lib);
es1::getProcAddress = (__eglMustCastToProperFunctionPointerType (*)(const char*))getProcAddress(libGLES_CM, "glGetProcAddress");
return libEGL != 0; return libEGL != 0;
} }
...@@ -71,7 +62,6 @@ DESTRUCTOR static void glDetachProcess() ...@@ -71,7 +62,6 @@ DESTRUCTOR static void glDetachProcess()
glDetachThread(); glDetachThread();
freeLibrary(libEGL); freeLibrary(libEGL);
freeLibrary(libGLES_CM);
} }
#if defined(_WIN32) #if defined(_WIN32)
...@@ -99,15 +89,15 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved ...@@ -99,15 +89,15 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved
} }
#endif #endif
namespace es2 namespace rad
{ {
es2::Context *getContext() rad::Context *getContext()
{ {
egl::Context *context = egl::getCurrentContext(); egl::Context *context = egl::getCurrentContext();
if(context && context->getClientVersion() == 2) if(context && context->getClientVersion() == 2)
{ {
return static_cast<es2::Context*>(context); return static_cast<rad::Context*>(context);
} }
return 0; return 0;
...@@ -139,7 +129,7 @@ GLint getClientVersion() ...@@ -139,7 +129,7 @@ GLint getClientVersion()
// Records an error code // Records an error code
void error(GLenum errorCode) void error(GLenum errorCode)
{ {
es2::Context *context = es2::getContext(); rad::Context *context = rad::getContext();
if(context) if(context)
{ {
...@@ -176,10 +166,4 @@ namespace egl ...@@ -176,10 +166,4 @@ namespace egl
egl::Display *(*getCurrentDisplay)() = 0; egl::Display *(*getCurrentDisplay)() = 0;
} }
namespace es1
{
__eglMustCastToProperFunctionPointerType (*getProcAddress)(const char *procname) = 0;
}
void *libEGL = 0; // Handle to the libEGL module void *libEGL = 0; // Handle to the libEGL module
void *libGLES_CM = 0; // Handle to the libGLES_CM module
src/Radiance/libRAD/main.h
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <GLES2/gl2.h> #include <GLES2/gl2.h>
#include <GLES2/gl2ext.h> #include <GLES2/gl2ext.h>
namespace es2 namespace rad
{ {
Context *getContext(); Context *getContext();
egl::Display *getDisplay(); egl::Display *getDisplay();
...@@ -52,13 +52,6 @@ namespace egl ...@@ -52,13 +52,6 @@ namespace egl
extern egl::Display *(*getCurrentDisplay)(); 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 *libEGL; // Handle to the libEGL module
extern void *libGLES_CM; // Handle to the libGLES_CM module
#endif // LIBGLESV2_MAIN_H_ #endif // LIBGLESV2_MAIN_H_
src/Radiance/libRAD/mathutil.h
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <math.h> #include <math.h>
namespace es2 namespace rad
{ {
inline bool isPow2(int x) inline bool isPow2(int x)
{ {
......
src/Radiance/libRAD/resource.h
//{{NO_DEPENDENCIES}} //{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file. // Microsoft Visual C++ generated include file.
// Used by libGLESv2.rc // Used by libRAD.rc
// Next default values for new objects // Next default values for new objects
// //
......
src/Radiance/libRAD/utilities.cpp
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <limits> #include <limits>
#include <stdio.h> #include <stdio.h>
namespace es2 namespace rad
{ {
int UniformComponentCount(GLenum type) int UniformComponentCount(GLenum type)
{ {
...@@ -440,7 +440,7 @@ namespace es2 ...@@ -440,7 +440,7 @@ namespace es2
} }
} }
namespace es2sw namespace rad2sw
{ {
sw::DepthCompareMode ConvertDepthComparison(GLenum comparison) sw::DepthCompareMode ConvertDepthComparison(GLenum comparison)
{ {
...@@ -478,7 +478,7 @@ namespace es2sw ...@@ -478,7 +478,7 @@ namespace es2sw
return sw::STENCIL_ALWAYS; return sw::STENCIL_ALWAYS;
} }
sw::Color<float> ConvertColor(es2::Color color) sw::Color<float> ConvertColor(rad::Color color)
{ {
return sw::Color<float>(color.red, color.green, color.blue, color.alpha); return sw::Color<float>(color.red, color.green, color.blue, color.alpha);
} }
...@@ -630,36 +630,36 @@ namespace es2sw ...@@ -630,36 +630,36 @@ namespace es2sw
} }
} }
bool ConvertPrimitiveType(GLenum primitiveType, GLsizei elementCount, es2::PrimitiveType &swPrimitiveType, int &primitiveCount) bool ConvertPrimitiveType(GLenum primitiveType, GLsizei elementCount, rad::PrimitiveType &swPrimitiveType, int &primitiveCount)
{ {
switch(primitiveType) switch(primitiveType)
{ {
case GL_POINTS: case GL_POINTS:
swPrimitiveType = es2::DRAW_POINTLIST; swPrimitiveType = rad::DRAW_POINTLIST;
primitiveCount = elementCount; primitiveCount = elementCount;
break; break;
case GL_LINES: case GL_LINES:
swPrimitiveType = es2::DRAW_LINELIST; swPrimitiveType = rad::DRAW_LINELIST;
primitiveCount = elementCount / 2; primitiveCount = elementCount / 2;
break; break;
case GL_LINE_LOOP: case GL_LINE_LOOP:
swPrimitiveType = es2::DRAW_LINELOOP; swPrimitiveType = rad::DRAW_LINELOOP;
primitiveCount = elementCount; primitiveCount = elementCount;
break; break;
case GL_LINE_STRIP: case GL_LINE_STRIP:
swPrimitiveType = es2::DRAW_LINESTRIP; swPrimitiveType = rad::DRAW_LINESTRIP;
primitiveCount = elementCount - 1; primitiveCount = elementCount - 1;
break; break;
case GL_TRIANGLES: case GL_TRIANGLES:
swPrimitiveType = es2::DRAW_TRIANGLELIST; swPrimitiveType = rad::DRAW_TRIANGLELIST;
primitiveCount = elementCount / 3; primitiveCount = elementCount / 3;
break; break;
case GL_TRIANGLE_STRIP: case GL_TRIANGLE_STRIP:
swPrimitiveType = es2::DRAW_TRIANGLESTRIP; swPrimitiveType = rad::DRAW_TRIANGLESTRIP;
primitiveCount = elementCount - 2; primitiveCount = elementCount - 2;
break; break;
case GL_TRIANGLE_FAN: case GL_TRIANGLE_FAN:
swPrimitiveType = es2::DRAW_TRIANGLEFAN; swPrimitiveType = rad::DRAW_TRIANGLEFAN;
primitiveCount = elementCount - 2; primitiveCount = elementCount - 2;
break; break;
default: default:
...@@ -686,7 +686,7 @@ namespace es2sw ...@@ -686,7 +686,7 @@ namespace es2sw
} }
} }
namespace sw2es namespace sw2rad
{ {
unsigned int GetStencilSize(sw::Format stencilFormat) unsigned int GetStencilSize(sw::Format stencilFormat)
{ {
......
src/Radiance/libRAD/utilities.h
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <string> #include <string>
namespace es2 namespace rad
{ {
struct Color; struct Color;
...@@ -53,11 +53,11 @@ namespace es2 ...@@ -53,11 +53,11 @@ namespace es2
bool IsStencilRenderable(GLenum internalformat); bool IsStencilRenderable(GLenum internalformat);
} }
namespace es2sw namespace rad2sw
{ {
sw::DepthCompareMode ConvertDepthComparison(GLenum comparison); sw::DepthCompareMode ConvertDepthComparison(GLenum comparison);
sw::StencilCompareMode ConvertStencilComparison(GLenum comparison); sw::StencilCompareMode ConvertStencilComparison(GLenum comparison);
sw::Color<float> ConvertColor(es2::Color color); sw::Color<float> ConvertColor(rad::Color color);
sw::BlendFactor ConvertBlendFunc(GLenum blend); sw::BlendFactor ConvertBlendFunc(GLenum blend);
sw::BlendOperation ConvertBlendOp(GLenum blendOp); sw::BlendOperation ConvertBlendOp(GLenum blendOp);
sw::StencilOperation ConvertStencilOp(GLenum stencilOp); sw::StencilOperation ConvertStencilOp(GLenum stencilOp);
...@@ -66,11 +66,11 @@ namespace es2sw ...@@ -66,11 +66,11 @@ namespace es2sw
unsigned int ConvertColorMask(bool red, bool green, bool blue, bool alpha); unsigned int ConvertColorMask(bool red, bool green, bool blue, bool alpha);
sw::FilterType ConvertMagFilter(GLenum magFilter); sw::FilterType ConvertMagFilter(GLenum magFilter);
void ConvertMinFilter(GLenum texFilter, sw::FilterType *minFilter, sw::MipmapType *mipFilter, float maxAnisotropy); void ConvertMinFilter(GLenum texFilter, sw::FilterType *minFilter, sw::MipmapType *mipFilter, float maxAnisotropy);
bool ConvertPrimitiveType(GLenum primitiveType, GLsizei elementCount, es2::PrimitiveType &swPrimitiveType, int &primitiveCount); bool ConvertPrimitiveType(GLenum primitiveType, GLsizei elementCount, rad::PrimitiveType &swPrimitiveType, int &primitiveCount);
sw::Format ConvertRenderbufferFormat(GLenum format); sw::Format ConvertRenderbufferFormat(GLenum format);
} }
namespace sw2es namespace sw2rad
{ {
GLuint GetAlphaSize(sw::Format colorFormat); GLuint GetAlphaSize(sw::Format colorFormat);
GLuint GetRedSize(sw::Format colorFormat); GLuint GetRedSize(sw::Format colorFormat);
......
src/SwiftShader.sln
...@@ -236,6 +236,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGLESBasicTnL", "..\tests\t ...@@ -236,6 +236,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGLESBasicTnL", "..\tests\t
{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6} = {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6} {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6} = {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{B7E24D8E-6BE9-4DEF-A8B9-6A6E60CA60E9}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libRAD", "Radiance\libRAD\libRAD.vcxproj", "{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}"
ProjectSection(ProjectDependencies) = postProject
{2F6770B5-F168-4FCD-8A56-4DD95BEC8893} = {2F6770B5-F168-4FCD-8A56-4DD95BEC8893}
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Radiance", "Radiance", "{CA0EBD66-3F60-4F3D-8143-B31F14458B40}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libEGL", "Radiance\libEGL\libEGL.vcxproj", "{2F6770B5-F168-4FCD-8A56-4DD95BEC8893}"
ProjectSection(ProjectDependencies) = postProject
{7B02CB19-4CDF-4F79-BC9B-7F3F6164A003} = {7B02CB19-4CDF-4F79-BC9B-7F3F6164A003}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Compiler", "Radiance\compiler\Compiler.vcxproj", "{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preprocessor", "Radiance\compiler\preprocessor\preprocessor.vcxproj", "{6303975E-7060-4CE7-8090-CB2DE0B840B4}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32 Debug|Win32 = Debug|Win32
...@@ -627,6 +645,42 @@ Global ...@@ -627,6 +645,42 @@ Global
{AB1EB229-D86C-41B3-8E20-7A7E1FF5DDF5}.Release|Win32.Build.0 = Release|Win32 {AB1EB229-D86C-41B3-8E20-7A7E1FF5DDF5}.Release|Win32.Build.0 = Release|Win32
{AB1EB229-D86C-41B3-8E20-7A7E1FF5DDF5}.Release|x64.ActiveCfg = Release|x64 {AB1EB229-D86C-41B3-8E20-7A7E1FF5DDF5}.Release|x64.ActiveCfg = Release|x64
{AB1EB229-D86C-41B3-8E20-7A7E1FF5DDF5}.Release|x64.Build.0 = Release|x64 {AB1EB229-D86C-41B3-8E20-7A7E1FF5DDF5}.Release|x64.Build.0 = Release|x64
{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Debug|Win32.ActiveCfg = Debug|Win32
{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Debug|Win32.Build.0 = Debug|Win32
{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Debug|x64.ActiveCfg = Debug|Win32
{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Profile|Win32.ActiveCfg = Profile|Win32
{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Profile|Win32.Build.0 = Profile|Win32
{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Profile|x64.ActiveCfg = Profile|Win32
{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Release|Win32.ActiveCfg = Release|Win32
{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Release|Win32.Build.0 = Release|Win32
{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}.Release|x64.ActiveCfg = Release|Win32
{2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Debug|Win32.ActiveCfg = Debug|Win32
{2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Debug|Win32.Build.0 = Debug|Win32
{2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Debug|x64.ActiveCfg = Debug|Win32
{2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Profile|Win32.ActiveCfg = Profile|Win32
{2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Profile|Win32.Build.0 = Profile|Win32
{2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Profile|x64.ActiveCfg = Profile|Win32
{2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Release|Win32.ActiveCfg = Release|Win32
{2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Release|Win32.Build.0 = Release|Win32
{2F6770B5-F168-4FCD-8A56-4DD95BEC8893}.Release|x64.ActiveCfg = Release|Win32
{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Debug|Win32.ActiveCfg = Debug|Win32
{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Debug|Win32.Build.0 = Debug|Win32
{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Debug|x64.ActiveCfg = Debug|Win32
{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Profile|Win32.ActiveCfg = Profile|Win32
{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Profile|Win32.Build.0 = Profile|Win32
{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Profile|x64.ActiveCfg = Profile|Win32
{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Release|Win32.ActiveCfg = Release|Win32
{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Release|Win32.Build.0 = Release|Win32
{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}.Release|x64.ActiveCfg = Release|Win32
{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Debug|Win32.ActiveCfg = Debug|Win32
{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Debug|Win32.Build.0 = Debug|Win32
{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Debug|x64.ActiveCfg = Debug|Win32
{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Profile|Win32.ActiveCfg = Release|Win32
{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Profile|Win32.Build.0 = Release|Win32
{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Profile|x64.ActiveCfg = Release|Win32
{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Release|Win32.ActiveCfg = Release|Win32
{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Release|Win32.Build.0 = Release|Win32
{6303975E-7060-4CE7-8090-CB2DE0B840B4}.Release|x64.ActiveCfg = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
...@@ -660,8 +714,13 @@ Global ...@@ -660,8 +714,13 @@ Global
{235B1D85-E6B6-45E2-BA5D-5C60396428FF} = {D33114D7-E582-4D61-B27D-FAB0297C43FF} {235B1D85-E6B6-45E2-BA5D-5C60396428FF} = {D33114D7-E582-4D61-B27D-FAB0297C43FF}
{9DAFEE32-19F6-4410-AA09-2B564FB86F62} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D} {9DAFEE32-19F6-4410-AA09-2B564FB86F62} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}
{9CF4408B-9B08-481F-95DA-3DF0846DABE4} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D} {9CF4408B-9B08-481F-95DA-3DF0846DABE4} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}
{09ABE661-9BC0-4152-A820-1FB0522CAC01} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}
{04FC5430-3F1B-42A2-A18A-D8BB7E5B2733} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D} {04FC5430-3F1B-42A2-A18A-D8BB7E5B2733} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}
{AB1EB229-D86C-41B3-8E20-7A7E1FF5DDF5} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D} {AB1EB229-D86C-41B3-8E20-7A7E1FF5DDF5} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}
{B7E24D8E-6BE9-4DEF-A8B9-6A6E60CA60E9} = {ED25C308-5BDB-43A7-BED6-C2C059FC2D7D}
{09ABE661-9BC0-4152-A820-1FB0522CAC01} = {B7E24D8E-6BE9-4DEF-A8B9-6A6E60CA60E9}
{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD} = {CA0EBD66-3F60-4F3D-8143-B31F14458B40}
{2F6770B5-F168-4FCD-8A56-4DD95BEC8893} = {CA0EBD66-3F60-4F3D-8143-B31F14458B40}
{5AEBF8B8-3454-4984-9D77-A8F13BC0377B} = {CA0EBD66-3F60-4F3D-8143-B31F14458B40}
{6303975E-7060-4CE7-8090-CB2DE0B840B4} = {CA0EBD66-3F60-4F3D-8143-B31F14458B40}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment