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 242 additions and 258 deletions
src/Radiance/compiler/Compiler.vcxproj
......@@ -15,7 +15,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{5B3A6DB8-1E7E-40D7-92B9-DA8AAE619FAD}</ProjectGuid>
<ProjectGuid>{5AEBF8B8-3454-4984-9D77-A8F13BC0377B}</ProjectGuid>
<RootNamespace>compiler</RootNamespace>
<Keyword>Win32Proj</Keyword>
<ProjectName>Compiler</ProjectName>
......@@ -203,8 +203,8 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="preprocessor\preprocessor.vcxproj">
<Project>{92940255-ab4b-42fb-a2c4-0fab19c3c48a}</Project>
<Private>true</Private>
<Project>{6303975e-7060-4ce7-8090-cb2de0b840b4}</Project>
<Private>false</Private>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
......
src/Radiance/compiler/OutputASM.cpp
......@@ -14,7 +14,7 @@
#include "common/debug.h"
#include "compiler/InfoSink.h"
#include "libGLESv2/Shader.h"
#include "libRAD/Shader.h"
#define GL_APICALL
#include <GLES2/gl2.h>
......@@ -99,7 +99,7 @@ namespace sh
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;
pixelShader = 0;
......@@ -2003,10 +2003,10 @@ namespace sh
{
const TType &type = varying->getType();
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
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)
{
......@@ -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 @@
#include <set>
#include <map>
namespace es2
namespace rad
{
class Shader;
}
......@@ -81,7 +81,7 @@ namespace sh
class OutputASM : public TIntermTraverser
{
public:
explicit OutputASM(TParseContext &context, es2::Shader *shaderObject);
explicit OutputASM(TParseContext &context, rad::Shader *shaderObject);
~OutputASM();
void output();
......@@ -144,7 +144,7 @@ namespace sh
static int dim2(TIntermNode *m);
static unsigned int loopCount(TIntermLoop *node);
es2::Shader *const shaderObject;
rad::Shader *const shaderObject;
sw::Shader *shader;
sw::PixelShader *pixelShader;
sw::VertexShader *vertexShader;
......
src/Radiance/compiler/TranslatorASM.cpp
......@@ -13,7 +13,7 @@
#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 @@
#include "Shader/PixelShader.hpp"
#include "Shader/VertexShader.hpp"
namespace es2
namespace rad
{
class Shader;
}
......@@ -25,13 +25,13 @@ namespace es2
class TranslatorASM : public TCompiler
{
public:
TranslatorASM(es2::Shader *shaderObject, ShShaderType type, ShShaderSpec spec);
TranslatorASM(rad::Shader *shaderObject, ShShaderType type, ShShaderSpec spec);
protected:
virtual bool translate(TIntermNode* root);
private:
es2::Shader *const shaderObject;
rad::Shader *const shaderObject;
};
#endif // COMPILER_TRANSLATORASM_H_
src/Radiance/compiler/preprocessor/preprocessor.vcxproj
......@@ -11,7 +11,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{92940255-AB4B-42FB-A2C4-0FAB19C3C48A}</ProjectGuid>
<ProjectGuid>{6303975E-7060-4CE7-8090-CB2DE0B840B4}</ProjectGuid>
<RootNamespace>preprocessor</RootNamespace>
</PropertyGroup>
<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
const egl::Config *config = mConfigSet.get(configHandle);
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);
}
}
else if(clientVersion == 2 && config->mRenderableType & EGL_OPENGL_ES2_BIT)
{
if(es2::createContext != 0)
{
context = es2::createContext(config, shareContext);
context = rad::createContext(config, shareContext);
}
}
else
......
src/Radiance/libEGL/Surface.cpp
......@@ -132,7 +132,7 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight)
if(mWindow)
{
frameBuffer = es::createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight);
frameBuffer = rad::createFrameBuffer(mDisplay->getNativeDisplay(), mWindow, backBufferWidth, backBufferHeight);
if(!frameBuffer)
{
......@@ -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)
{
......@@ -153,7 +153,7 @@ bool Surface::reset(int backBufferWidth, int backBufferHeight)
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)
{
......
src/Radiance/libEGL/libEGL.cpp
......@@ -1207,15 +1207,9 @@ __eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const cha
}
}
if(es2::getProcAddress != 0)
if(rad::getProcAddress != 0)
{
__eglMustCastToProperFunctionPointerType proc = es2::getProcAddress(procname);
if(proc) return proc;
}
if(es1::getProcAddress != 0)
{
__eglMustCastToProperFunctionPointerType proc = es1::getProcAddress(procname);
__eglMustCastToProperFunctionPointerType proc = rad::getProcAddress(procname);
if(proc) return proc;
}
}
......
src/Radiance/libEGL/libEGL.vcxproj
......@@ -15,7 +15,7 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}</ProjectGuid>
<ProjectGuid>{2F6770B5-F168-4FCD-8A56-4DD95BEC8893}</ProjectGuid>
<RootNamespace>libEGL</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
......
src/Radiance/libEGL/main.cpp
......@@ -84,37 +84,19 @@ CONSTRUCTOR static bool eglAttachProcess()
eglAttachThread();
#if defined(_WIN32)
const char *libGLES_CM_lib = "libGLES_CM.dll";
const char *libRAD_lib = "libRAD.dll";
#else
const char *libGLES_CM_lib = "libGLES_CM.so.1";
const char *libRAD_lib = "libRAD.so";
#endif
libGLES_CM = loadLibrary(libGLES_CM_lib);
es1::createContext = (egl::Context *(*)(const egl::Config*, const egl::Context*))getProcAddress(libGLES_CM, "glCreateContext");
es1::getProcAddress = (__eglMustCastToProperFunctionPointerType (*)(const char*))getProcAddress(libGLES_CM, "glGetProcAddress");
libRAD = loadLibrary(libRAD_lib);
rad::createContext = (egl::Context *(*)(const egl::Config*, const egl::Context*))getProcAddress(libRAD, "glCreateContext");
rad::getProcAddress = (__eglMustCastToProperFunctionPointerType (*)(const char*))getProcAddress(libRAD, "glGetProcAddress");
rad::createBackBuffer = (egl::Image *(*)(int, int, const egl::Config*))getProcAddress(libRAD, "createBackBuffer");
rad::createDepthStencil = (egl::Image *(*)(unsigned int, unsigned int, sw::Format, int, bool))getProcAddress(libRAD, "createDepthStencil");
rad::createFrameBuffer = (sw::FrameBuffer *(*)(EGLNativeDisplayType, EGLNativeWindowType, int, int))getProcAddress(libRAD, "createFrameBuffer");
#if defined(_WIN32)
const char *libGLESv2_lib = "libGLESv2.dll";
#else
const char *libGLESv2_lib = "libGLESv2.so.2";
#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;
return libRAD != 0;
}
DESTRUCTOR static void eglDetachProcess()
......@@ -123,7 +105,7 @@ DESTRUCTOR static void eglDetachProcess()
eglDetachThread();
sw::Thread::freeLocalStorageKey(currentTLS);
freeLibrary(libGLESv2);
freeLibrary(libRAD);
}
#if defined(_WIN32)
......@@ -318,24 +300,14 @@ void error(EGLint errorCode)
}
}
namespace es1
{
egl::Context *(*createContext)(const egl::Config *config, const egl::Context *shareContext) = 0;
__eglMustCastToProperFunctionPointerType (*getProcAddress)(const char *procname) = 0;
}
namespace es2
namespace rad
{
egl::Context *(*createContext)(const egl::Config *config, const egl::Context *shareContext) = 0;
__eglMustCastToProperFunctionPointerType (*getProcAddress)(const char *procname) = 0;
}
namespace es
{
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;
sw::FrameBuffer *(*createFrameBuffer)(EGLNativeDisplayType display, EGLNativeWindowType window, int width, int height) = 0;
}
void *libGLES_CM = 0; // Handle to the libGLES_CM module
void *libGLESv2 = 0; // Handle to the libGLESv2 module
void *libRAD = 0; // Handle to the libRAD module
src/Radiance/libEGL/main.h
......@@ -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_
src/Radiance/libRAD/Buffer.cpp
......@@ -19,7 +19,7 @@
#include "VertexDataManager.h"
#include "IndexDataManager.h"
namespace es2
namespace rad
{
Buffer::Buffer(GLuint id) : RefCountObject(id)
......
src/Radiance/libRAD/Buffer.h
......@@ -25,7 +25,7 @@
#include <cstddef>
#include <vector>
namespace es2
namespace rad
{
class Buffer : public RefCountObject
{
......
src/Radiance/libRAD/Context.h
......@@ -38,7 +38,7 @@ class Surface;
class Config;
}
namespace es2
namespace rad
{
struct TranslatedAttribute;
struct TranslatedIndexData;
......
src/Radiance/libRAD/Device.cpp
......@@ -27,7 +27,7 @@
bool localShaderConstants = false;
namespace es2
namespace rad
{
using namespace sw;
......
src/Radiance/libRAD/Device.hpp
......@@ -19,7 +19,7 @@ namespace egl
class Image;
}
namespace es2
namespace rad
{
class Texture;
class Image;
......
src/Radiance/libRAD/Fence.cpp
......@@ -16,7 +16,7 @@
#include "main.h"
#include "Common/Thread.hpp"
namespace es2
namespace rad
{
Fence::Fence()
......
src/Radiance/libRAD/Fence.h
......@@ -17,7 +17,7 @@
#define GL_APICALL
#include <GLES2/gl2.h>
namespace es2
namespace rad
{
class Fence
......
src/Radiance/libRAD/Framebuffer.cpp
......@@ -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;
}
......
src/Radiance/libRAD/Framebuffer.h
......@@ -21,7 +21,7 @@
#define GL_APICALL
#include <GLES2/gl2.h>
namespace es2
namespace rad
{
class Renderbuffer;
class Colorbuffer;
......
src/Radiance/libRAD/HandleAllocator.cpp
......@@ -16,7 +16,7 @@
#include "main.h"
namespace es2
namespace rad
{
HandleAllocator::HandleAllocator() : mBaseValue(1), mNextValue(1)
......
src/Radiance/libRAD/HandleAllocator.h
......@@ -20,7 +20,7 @@
#include <vector>
namespace es2
namespace rad
{
class HandleAllocator
......
src/Radiance/libRAD/Image.cpp
......@@ -18,7 +18,7 @@
#include <GLES2/gl2ext.h>
namespace es2
namespace rad
{
static sw::Resource *getParentResource(Texture *texture)
{
......
src/Radiance/libRAD/Image.hpp
......@@ -18,7 +18,7 @@
#define GL_APICALL
#include <GLES2/gl2.h>
namespace es2
namespace rad
{
class Texture;
......
src/Radiance/libRAD/IndexDataManager.cpp
......@@ -25,7 +25,7 @@ namespace
enum { INITIAL_INDEX_BUFFER_SIZE = 4096 * sizeof(GLuint) };
}
namespace es2
namespace rad
{
IndexDataManager::IndexDataManager()
......
src/Radiance/libRAD/IndexDataManager.h
......@@ -20,7 +20,7 @@
#define GL_APICALL
#include <GLES2/gl2.h>
namespace es2
namespace rad
{
struct TranslatedIndexData
......
src/Radiance/libRAD/Program.cpp
......@@ -24,7 +24,7 @@
#include <string>
#include <stdlib.h>
namespace es2
namespace rad
{
unsigned int Program::currentSerial = 1;
......
src/Radiance/libRAD/Program.h
......@@ -24,7 +24,7 @@
#include <vector>
#include <set>
namespace es2
namespace rad
{
class Device;
class ResourceManager;
......@@ -163,7 +163,7 @@ namespace es2
static unsigned int issueSerial();
private:
es2::Device *device;
rad::Device *device;
FragmentShader *fragmentShader;
VertexShader *vertexShader;
......
src/Radiance/libRAD/Query.cpp
......@@ -9,14 +9,14 @@
// 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 "main.h"
#include "Common/Thread.hpp"
namespace es2
namespace rad
{
Query::Query(GLuint id, GLenum type) : RefCountObject(id)
......
src/Radiance/libRAD/Query.h
......@@ -9,7 +9,7 @@
// 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_
#define LIBGLESV2_QUERY_H_
......@@ -20,7 +20,7 @@
#define GL_APICALL
#include <GLES2/gl2.h>
namespace es2
namespace rad
{
class Query : public RefCountObject
......
src/Radiance/libRAD/RefCountObject.cpp
......@@ -18,7 +18,7 @@
#include "Common/Thread.hpp"
namespace es2
namespace rad
{
RefCountObject::RefCountObject(GLuint id)
......
src/Radiance/libRAD/RefCountObject.h
......@@ -24,7 +24,7 @@
#include <cstddef>
namespace es2
namespace rad
{
class RefCountObject
......
src/Radiance/libRAD/Renderbuffer.cpp
......@@ -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;
}
}
......
src/Radiance/libRAD/Renderbuffer.h
......@@ -23,7 +23,7 @@
#define GL_APICALL
#include <GLES2/gl2.h>
namespace es2
namespace rad
{
class Texture2D;
class TextureCubeMap;
......
src/Radiance/libRAD/ResourceManager.cpp
......@@ -20,7 +20,7 @@
#include "Shader.h"
#include "Texture.h"
namespace es2
namespace rad
{
ResourceManager::ResourceManager()
{
......
src/Radiance/libRAD/ResourceManager.h
......@@ -22,7 +22,7 @@
#include <map>
namespace es2
namespace rad
{
class Buffer;
class Shader;
......
src/Radiance/libRAD/Shader.cpp
......@@ -22,7 +22,7 @@
#include <string>
namespace es2
namespace rad
{
Shader::Shader(ResourceManager *manager, GLuint handle) : mHandle(handle), mResourceManager(manager)
{
......
src/Radiance/libRAD/Shader.h
......@@ -32,7 +32,7 @@ namespace sh
class OutputASM;
}
namespace es2
namespace rad
{
struct Varying
{
......@@ -46,7 +46,7 @@ struct Varying
return arraySize >= 1;
}
int size() const // Unify with es2::Uniform?
int size() const // Unify with rad::Uniform?
{
return arraySize > 0 ? arraySize : 1;
}
......
src/Radiance/libRAD/Texture.cpp
......@@ -25,7 +25,7 @@
#include <algorithm>
namespace es2
namespace rad
{
Texture::Texture(GLuint id) : RefCountObject(id)
......@@ -1156,17 +1156,17 @@ void TextureExternal::setImage(Image *sharedImage)
// Exported functions for use by EGL
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)
{
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;
}
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)
{
......@@ -1199,7 +1199,7 @@ extern "C"
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)
{
......
src/Radiance/libRAD/Texture.h
......@@ -33,7 +33,7 @@ class Surface;
class Config;
}
namespace es2
namespace rad
{
class Framebuffer;
......
src/Radiance/libRAD/VertexDataManager.cpp
......@@ -24,7 +24,7 @@ namespace
enum {INITIAL_STREAM_BUFFER_SIZE = 1024 * 1024};
}
namespace es2
namespace rad
{
VertexDataManager::VertexDataManager(Context *context) : mContext(context)
......
src/Radiance/libRAD/VertexDataManager.h
......@@ -21,7 +21,7 @@
#define GL_APICALL
#include <GLES2/gl2.h>
namespace es2
namespace rad
{
struct TranslatedAttribute
......
src/Radiance/libRAD/libGLESv2.cbp → src/Radiance/libRAD/libRAD.cbp
......@@ -2,12 +2,12 @@
<CodeBlocks_project_file>
<FileVersion major="1" minor="6" />
<Project>
<Option title="libGLESv2" />
<Option title="libRAD" />
<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 output="./../../bin/x86/Debug/libRAD.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x86/Debug/" />
<Option type="3" />
<Option compiler="gcc" />
......@@ -23,7 +23,7 @@
</Linker>
</Target>
<Target title="Release x86">
<Option output="./../../bin/x86/Release/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
<Option output="./../../bin/x86/Release/libRAD.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x86/Release/" />
<Option type="3" />
<Option compiler="gcc" />
......@@ -47,7 +47,7 @@
</Linker>
</Target>
<Target title="Debug x64">
<Option output="./../../bin/x64/Debug/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
<Option output="./../../bin/x64/Debug/libRAD.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x64/Debug/" />
<Option type="3" />
<Option compiler="gcc" />
......@@ -64,7 +64,7 @@
</Linker>
</Target>
<Target title="Release x64">
<Option output="./../../bin/x64/Release/libGLESv2.so.2" prefix_auto="0" extension_auto="0" />
<Option output="./../../bin/x64/Release/libRAD.so.2" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/x64/Release/" />
<Option type="3" />
<Option compiler="gcc" />
......@@ -230,47 +230,47 @@
<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="./../libRAD/Buffer.cpp" />
<Unit filename="./../libRAD/Buffer.h" />
<Unit filename="./../libRAD/Context.cpp" />
<Unit filename="./../libRAD/Context.h" />
<Unit filename="./../libRAD/Device.cpp" />
<Unit filename="./../libRAD/Device.hpp" />
<Unit filename="./../libRAD/Fence.cpp" />
<Unit filename="./../libRAD/Fence.h" />
<Unit filename="./../libRAD/Framebuffer.cpp" />
<Unit filename="./../libRAD/Framebuffer.h" />
<Unit filename="./../libRAD/HandleAllocator.cpp" />
<Unit filename="./../libRAD/HandleAllocator.h" />
<Unit filename="./../libRAD/Image.cpp" />
<Unit filename="./../libRAD/Image.hpp" />
<Unit filename="./../libRAD/IndexDataManager.cpp" />
<Unit filename="./../libRAD/IndexDataManager.h" />
<Unit filename="./../libRAD/Program.cpp" />
<Unit filename="./../libRAD/Program.h" />
<Unit filename="./../libRAD/Query.cpp" />
<Unit filename="./../libRAD/Query.h" />
<Unit filename="./../libRAD/RefCountObject.cpp" />
<Unit filename="./../libRAD/RefCountObject.h" />
<Unit filename="./../libRAD/Renderbuffer.cpp" />
<Unit filename="./../libRAD/Renderbuffer.h" />
<Unit filename="./../libRAD/ResourceManager.cpp" />
<Unit filename="./../libRAD/ResourceManager.h" />
<Unit filename="./../libRAD/Shader.cpp" />
<Unit filename="./../libRAD/Shader.h" />
<Unit filename="./../libRAD/Texture.cpp" />
<Unit filename="./../libRAD/Texture.h" />
<Unit filename="./../libRAD/Unknown.hpp" />
<Unit filename="./../libRAD/VertexDataManager.cpp" />
<Unit filename="./../libRAD/VertexDataManager.h" />
<Unit filename="./../libRAD/libRAD.cpp" />
<Unit filename="./../libRAD/main.cpp" />
<Unit filename="./../libRAD/main.h" />
<Unit filename="./../libRAD/mathutil.h" />
<Unit filename="./../libRAD/resource.h" />
<Unit filename="./../libRAD/utilities.cpp" />
<Unit filename="./../libRAD/utilities.h" />
<Unit filename="./../libRAD/vertexconversion.h" />
<Unit filename="./../../Main/Config.cpp" />
<Unit filename="./../../Main/Config.hpp" />
<Unit filename="./../../Main/FrameBuffer.cpp" />
......
src/Radiance/libRAD/libGLESv2.def → src/Radiance/libRAD/libRAD.def
LIBRARY libGLESv2
LIBRARY libRAD
EXPORTS
glActiveTexture @1
glAttachShader @2
......
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">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
......@@ -15,8 +15,8 @@
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{B5871A7A-968C-42E3-A33B-981E6F448E78}</ProjectGuid>
<RootNamespace>libGLESv2</RootNamespace>
<ProjectGuid>{A08DD1A8-998C-4FBB-8710-89B80D0BC3AD}</ProjectGuid>
<RootNamespace>libRAD</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
......@@ -84,14 +84,14 @@
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>
<ModuleDefinitionFile>libRAD.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
</Link>
<PostBuildEvent>
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)\"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>
copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -115,7 +115,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>
<ModuleDefinitionFile>libRAD.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
......@@ -124,7 +124,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
</Link>
<PostBuildEvent>
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)\"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>
copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
......@@ -147,7 +147,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<ModuleDefinitionFile>libGLESv2.def</ModuleDefinitionFile>
<ModuleDefinitionFile>libRAD.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
......@@ -156,7 +156,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
</Link>
<PostBuildEvent>
<Command>mkdir "$(ProjectDir)..\..\..\lib\$(Configuration)\"
copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>
copy "$(OutDir)libRAD.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
......@@ -169,7 +169,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
<ClCompile Include="HandleAllocator.cpp" />
<ClCompile Include="Image.cpp" />
<ClCompile Include="IndexDataManager.cpp" />
<ClCompile Include="libGLESv2.cpp" />
<ClCompile Include="libRAD.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="Program.cpp" />
<ClCompile Include="Query.cpp" />
......@@ -208,10 +208,10 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
<ClInclude Include="VertexDataManager.h" />
</ItemGroup>
<ItemGroup>
<None Include="libGLESv2.def" />
<None Include="libRAD.def" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="libGLESv2.rc" />
<ResourceCompile Include="libRAD.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\SwiftShader\SwiftShader.vcxproj">
......@@ -223,7 +223,7 @@ copy "$(OutDir)libGLESv2.dll" "$(ProjectDir)..\..\..\lib\$(Configuration)\"</Com
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
</ProjectReference>
<ProjectReference Include="..\compiler\Compiler.vcxproj">
<Project>{5b3a6db8-1e7e-40d7-92b9-da8aae619fad}</Project>
<Project>{5aebf8b8-3454-4984-9d77-a8f13bc0377b}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
......
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">
<ItemGroup>
<Filter Include="Source Files">
......@@ -32,7 +32,7 @@
<ClCompile Include="IndexDataManager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="libGLESv2.cpp">
<ClCompile Include="libRAD.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="main.cpp">
......@@ -147,9 +147,9 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="libGLESv2.rc" />
<ResourceCompile Include="libRAD.rc" />
</ItemGroup>
<ItemGroup>
<None Include="libGLESv2.def" />
<None Include="libRAD.def" />
</ItemGroup>
</Project>
src/Radiance/libRAD/main.cpp
......@@ -53,15 +53,6 @@ CONSTRUCTOR static bool glAttachProcess()
egl::getCurrentContext = (egl::Context *(*)())getProcAddress(libEGL, "eglGetCurrentContext");
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;
}
......@@ -71,7 +62,6 @@ DESTRUCTOR static void glDetachProcess()
glDetachThread();
freeLibrary(libEGL);
freeLibrary(libGLES_CM);
}
#if defined(_WIN32)
......@@ -99,15 +89,15 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved
}
#endif
namespace es2
namespace rad
{
es2::Context *getContext()
rad::Context *getContext()
{
egl::Context *context = egl::getCurrentContext();
if(context && context->getClientVersion() == 2)
{
return static_cast<es2::Context*>(context);
return static_cast<rad::Context*>(context);
}
return 0;
......@@ -139,7 +129,7 @@ GLint getClientVersion()
// Records an error code
void error(GLenum errorCode)
{
es2::Context *context = es2::getContext();
rad::Context *context = rad::getContext();
if(context)
{
......@@ -176,10 +166,4 @@ namespace egl
egl::Display *(*getCurrentDisplay)() = 0;
}
namespace es1
{
__eglMustCastToProperFunctionPointerType (*getProcAddress)(const char *procname) = 0;
}
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 @@
#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_
src/Radiance/libRAD/mathutil.h
......@@ -18,7 +18,7 @@
#include <math.h>
namespace es2
namespace rad
{
inline bool isPow2(int x)
{
......
src/Radiance/libRAD/resource.h
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
// Used by libGLESv2.rc
// Used by libRAD.rc
// Next default values for new objects
//
......
src/Radiance/libRAD/utilities.cpp
......@@ -20,7 +20,7 @@
#include <limits>
#include <stdio.h>
namespace es2
namespace rad
{
int UniformComponentCount(GLenum type)
{
......@@ -440,7 +440,7 @@ namespace es2
}
}
namespace es2sw
namespace rad2sw
{
sw::DepthCompareMode ConvertDepthComparison(GLenum comparison)
{
......@@ -478,7 +478,7 @@ namespace es2sw
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);
}
......@@ -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)
{
case GL_POINTS:
swPrimitiveType = es2::DRAW_POINTLIST;
swPrimitiveType = rad::DRAW_POINTLIST;
primitiveCount = elementCount;
break;
case GL_LINES:
swPrimitiveType = es2::DRAW_LINELIST;
swPrimitiveType = rad::DRAW_LINELIST;
primitiveCount = elementCount / 2;
break;
case GL_LINE_LOOP:
swPrimitiveType = es2::DRAW_LINELOOP;
swPrimitiveType = rad::DRAW_LINELOOP;
primitiveCount = elementCount;
break;
case GL_LINE_STRIP:
swPrimitiveType = es2::DRAW_LINESTRIP;
swPrimitiveType = rad::DRAW_LINESTRIP;
primitiveCount = elementCount - 1;
break;
case GL_TRIANGLES:
swPrimitiveType = es2::DRAW_TRIANGLELIST;
swPrimitiveType = rad::DRAW_TRIANGLELIST;
primitiveCount = elementCount / 3;
break;
case GL_TRIANGLE_STRIP:
swPrimitiveType = es2::DRAW_TRIANGLESTRIP;
swPrimitiveType = rad::DRAW_TRIANGLESTRIP;
primitiveCount = elementCount - 2;
break;
case GL_TRIANGLE_FAN:
swPrimitiveType = es2::DRAW_TRIANGLEFAN;
swPrimitiveType = rad::DRAW_TRIANGLEFAN;
primitiveCount = elementCount - 2;
break;
default:
......@@ -686,7 +686,7 @@ namespace es2sw
}
}
namespace sw2es
namespace sw2rad
{
unsigned int GetStencilSize(sw::Format stencilFormat)
{
......
src/Radiance/libRAD/utilities.h
......@@ -24,7 +24,7 @@
#include <string>
namespace es2
namespace rad
{
struct Color;
......@@ -53,11 +53,11 @@ namespace es2
bool IsStencilRenderable(GLenum internalformat);
}
namespace es2sw
namespace rad2sw
{
sw::DepthCompareMode ConvertDepthComparison(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::BlendOperation ConvertBlendOp(GLenum blendOp);
sw::StencilOperation ConvertStencilOp(GLenum stencilOp);
......@@ -66,11 +66,11 @@ namespace es2sw
unsigned int ConvertColorMask(bool red, bool green, bool blue, bool alpha);
sw::FilterType ConvertMagFilter(GLenum magFilter);
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);
}
namespace sw2es
namespace sw2rad
{
GLuint GetAlphaSize(sw::Format colorFormat);
GLuint GetRedSize(sw::Format colorFormat);
......
src/SwiftShader.sln
......@@ -236,6 +236,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OGLESBasicTnL", "..\tests\t
{E746FCA9-64C3-433E-85E8-9A5A67AB7ED6} = {E746FCA9-64C3-433E-85E8-9A5A67AB7ED6}
EndProjectSection
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
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
......@@ -627,6 +645,42 @@ Global
{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.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
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -660,8 +714,13 @@ Global
{235B1D85-E6B6-45E2-BA5D-5C60396428FF} = {D33114D7-E582-4D61-B27D-FAB0297C43FF}
{9DAFEE32-19F6-4410-AA09-2B564FB86F62} = {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}
{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
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