Skip to content

S
swiftshader
Commit b8df7f3b by Nicolas Capens Committed by Nicolas Capens
Options

Add Linux projects for Radiance.

Bug 18621031 Change-Id: I33429da66221ccb2c4f46fda91d501d28a2e4aec Reviewed-on: https://swiftshader-review.googlesource.com/1590Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent a6778bbe
Showing with 73 additions and 225 deletions
src/Radiance/libRAD/Surface.cpp
...@@ -33,7 +33,11 @@ extern "C" ...@@ -33,7 +33,11 @@ extern "C"
{ {
es2::Image *createBackBuffer(int width, int height, const egl::Config *config); es2::Image *createBackBuffer(int width, int height, const egl::Config *config);
es2::Image *createDepthStencil(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard); es2::Image *createDepthStencil(unsigned int width, unsigned int height, sw::Format format, int multiSampleDepth, bool discard);
#if defined(_WIN32)
sw::FrameBuffer *createFrameBuffer(HDC display, HWND window, int width, int height); sw::FrameBuffer *createFrameBuffer(HDC display, HWND window, int width, int height);
#else
sw::FrameBuffer *createFrameBuffer(void *display, Window window, int width, int height);
#endif
} }
namespace egl namespace egl
...@@ -89,13 +93,13 @@ bool Surface::initialize() ...@@ -89,13 +93,13 @@ bool Surface::initialize()
} }
void Surface::release() void Surface::release()
{ {
if(mDepthStencil) if(mDepthStencil)
{ {
mDepthStencil->release(); mDepthStencil->release();
mDepthStencil = NULL; mDepthStencil = NULL;
} }
if(backBuffer) if(backBuffer)
{ {
backBuffer->release(); backBuffer->release();
...@@ -122,7 +126,7 @@ bool Surface::reset() ...@@ -122,7 +126,7 @@ bool Surface::reset()
#else #else
XWindowAttributes windowAttributes; XWindowAttributes windowAttributes;
XGetWindowAttributes(mDisplay->getNativeDisplay(), mWindow, &windowAttributes); XGetWindowAttributes(mDisplay->getNativeDisplay(), mWindow, &windowAttributes);
return reset(windowAttributes.width, windowAttributes.height); return reset(windowAttributes.width, windowAttributes.height);
#endif #endif
} }
...@@ -217,7 +221,7 @@ void Surface::setSwapInterval(EGLint interval) ...@@ -217,7 +221,7 @@ void Surface::setSwapInterval(EGLint interval)
{ {
return; return;
} }
mSwapInterval = interval; mSwapInterval = interval;
mSwapInterval = std::max(mSwapInterval, mDisplay->getMinSwapInterval()); mSwapInterval = std::max(mSwapInterval, mDisplay->getMinSwapInterval());
mSwapInterval = std::min(mSwapInterval, mDisplay->getMaxSwapInterval()); mSwapInterval = std::min(mSwapInterval, mDisplay->getMaxSwapInterval());
......
src/Radiance/libRAD/exports.map
{ {
global: global:
glActiveTexture; radGetProcAddress;
glAttachShader;
glBindAttribLocation; eglBindAPI;
glBindBuffer; eglChooseConfig;
glBindFramebuffer; eglCreateContext;
glBindRenderbuffer; eglCreateWindowSurface;
glBindTexture; eglGetDisplay;
glBlendColor; eglGetError;
glBlendEquation; eglGetProcAddress;
glBlendEquationSeparate; eglInitialize;
glBlendFunc; eglMakeCurrent;
glBlendFuncSeparate; eglTerminate;
glBufferData;
glBufferSubData; Register;
glCheckFramebufferStatus;
glClear;
glClearColor;
glClearDepthf;
glClearStencil;
glColorMask;
glCompileShader;
glCompressedTexImage2D;
glCompressedTexSubImage2D;
glCopyTexImage2D;
glCopyTexSubImage2D;
glCreateProgram;
glCreateShader;
glCullFace;
glDeleteBuffers;
glDeleteFramebuffers;
glDeleteProgram;
glDeleteRenderbuffers;
glDeleteShader;
glDeleteTextures;
glDepthFunc;
glDepthMask;
glDepthRangef;
glDetachShader;
glDisable;
glDisableVertexAttribArray;
glDrawArrays;
glDrawElements;
glEnable;
glEnableVertexAttribArray;
glFinish;
glFlush;
glFramebufferRenderbuffer;
glFramebufferTexture2D;
glFrontFace;
glGenBuffers;
glGenFramebuffers;
glGenRenderbuffers;
glGenTextures;
glGenerateMipmap;
glGetActiveAttrib;
glGetActiveUniform;
glGetAttachedShaders;
glGetAttribLocation;
glGetBooleanv;
glGetBufferParameteriv;
glGetError;
glGetFloatv;
glGetFramebufferAttachmentParameteriv;
glGetIntegerv;
glGetProgramInfoLog;
glGetProgramiv;
glGetRenderbufferParameteriv;
glGetShaderInfoLog;
glGetShaderPrecisionFormat;
glGetShaderSource;
glGetShaderiv;
glGetString;
glGetTexParameterfv;
glGetTexParameteriv;
glGetUniformLocation;
glGetUniformfv;
glGetUniformiv;
glGetVertexAttribPointerv;
glGetVertexAttribfv;
glGetVertexAttribiv;
glHint;
glIsBuffer;
glIsEnabled;
glIsFramebuffer;
glIsProgram;
glIsRenderbuffer;
glIsShader;
glIsTexture;
glLineWidth;
glLinkProgram;
glPixelStorei;
glPolygonOffset;
glReadPixels;
glReleaseShaderCompiler;
glRenderbufferStorage;
glSampleCoverage;
glScissor;
glShaderBinary;
glShaderSource;
glStencilFunc;
glStencilFuncSeparate;
glStencilMask;
glStencilMaskSeparate;
glStencilOp;
glStencilOpSeparate;
glTexImage2D;
glTexParameterf;
glTexParameterfv;
glTexParameteri;
glTexParameteriv;
glTexSubImage2D;
glUniform1f;
glUniform1fv;
glUniform1i;
glUniform1iv;
glUniform2f;
glUniform2fv;
glUniform2i;
glUniform2iv;
glUniform3f;
glUniform3fv;
glUniform3i;
glUniform3iv;
glUniform4f;
glUniform4fv;
glUniform4i;
glUniform4iv;
glUniformMatrix2fv;
glUniformMatrix3fv;
glUniformMatrix4fv;
glUseProgram;
glValidateProgram;
glVertexAttrib1f;
glVertexAttrib1fv;
glVertexAttrib2f;
glVertexAttrib2fv;
glVertexAttrib3f;
glVertexAttrib3fv;
glVertexAttrib4f;
glVertexAttrib4fv;
glVertexAttribPointer;
glViewport;
# Extensions
glTexImage3DOES;
glBlitFramebufferANGLE;
glRenderbufferStorageMultisampleANGLE;
glDeleteFencesNV;
glFinishFenceNV;
glGenFencesNV;
glGetFenceivNV;
glIsFenceNV;
glSetFenceNV;
glTestFenceNV;
glGetGraphicsResetStatusEXT;
glReadnPixelsEXT;
glGetnUniformfvEXT;
glGetnUniformivEXT;
glGenQueriesEXT;
glDeleteQueriesEXT;
glIsQueryEXT;
glBeginQueryEXT;
glEndQueryEXT;
glGetQueryivEXT;
glGetQueryObjectuivEXT;
# EGL dependencies
glCreateContext;
glDestroyContext;
glMakeCurrent;
glGetCurrentContext;
glGetProcAddress;
glBindTexImage;
createFrameBuffer;
createBackBuffer;
createDevice;
Register;
local: local:
*; *;
......
src/SwiftShader.workspace
...@@ -13,5 +13,11 @@ ...@@ -13,5 +13,11 @@
<Depends filename="OpenGL/libEGL/libEGL.cbp" /> <Depends filename="OpenGL/libEGL/libEGL.cbp" />
<Depends filename="OpenGL/libGLESv2/libGLESv2.cbp" /> <Depends filename="OpenGL/libGLESv2/libGLESv2.cbp" />
</Project> </Project>
<Project filename="Radiance/libRAD/libRAD.cbp">
<Depends filename="LLVM/LLVM.cbp" />
</Project>
<Project filename="../tests/HelloRAD/rad.cbp">
<Depends filename="Radiance/libRAD/libRAD.cbp" />
</Project>
</Workspace> </Workspace>
</CodeBlocks_workspace_file> </CodeBlocks_workspace_file>
src/Radiance/libRAD/libEGL.cbp → tests/HelloRAD/rad.cbp
...@@ -2,100 +2,103 @@ ...@@ -2,100 +2,103 @@
<CodeBlocks_project_file> <CodeBlocks_project_file>
<FileVersion major="1" minor="6" /> <FileVersion major="1" minor="6" />
<Project> <Project>
<Option title="libEGL" /> <Option title="rad" />
<Option pch_mode="2" /> <Option pch_mode="2" />
<Option compiler="gcc" /> <Option compiler="clang" />
<Build> <Build>
<Target title="Debug x86"> <Target title="Debug x86">
<Option output="./../../bin/x86/Debug/libEGL.so.1" prefix_auto="0" extension_auto="0" /> <Option output="rad" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/x86/Debug/" /> <Option working_dir="../../lib/Debug_x86" />
<Option type="3" /> <Option object_output="obj/Debug_x86" />
<Option compiler="gcc" /> <Option type="1" />
<Option createDefFile="1" /> <Option compiler="clang" />
<Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add option="-m32" /> <Add option="-m32" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-m32" /> <Add option="-m32" />
<Add directory="../../lib/Debug_x86" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release x86"> <Target title="Release x86">
<Option output="./../../bin/x86/Release/libEGL.so.1" prefix_auto="0" extension_auto="0" /> <Option output="rad" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/x86/Release/" /> <Option working_dir="../../lib/Release_x86" />
<Option type="3" /> <Option object_output="obj/Release_x86" />
<Option compiler="gcc" /> <Option type="1" />
<Option createDefFile="1" /> <Option compiler="clang" />
<Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-m32" /> <Add option="-m32" />
<Add option="-DNDEBUG" /> <Add option="-DNDEBUG" />
<Add option="-DANGLE_DISABLE_TRACE" /> <Add option="-DANGLE_DISABLE_TRACE" />
<Add directory="./src/GL" />
</Compiler> </Compiler>
<ResourceCompiler>
<Add directory="./src/GL" />
</ResourceCompiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
<Add option="-m32" /> <Add option="-m32" />
<Add directory="../../lib/Release_x86" />
</Linker> </Linker>
</Target> </Target>
<Target title="Debug x64"> <Target title="Debug x64">
<Option output="./../../bin/x64/Debug/libEGL.so.1" prefix_auto="0" extension_auto="0" /> <Option output="rad" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/x64/Debug/" /> <Option working_dir="../../lib/Debug_x64" />
<Option type="3" /> <Option object_output="obj/Debug_x64" />
<Option compiler="gcc" /> <Option type="1" />
<Option createDefFile="1" /> <Option compiler="clang" />
<Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add option="-m64" /> <Add option="-m64" />
<Add option="-fPIC" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-m64" /> <Add option="-m64" />
<Add directory="../../lib/Debug_x64" />
</Linker> </Linker>
</Target> </Target>
<Target title="Release x64"> <Target title="Release x64">
<Option output="./../../bin/x64/Release/libEGL.so.1" prefix_auto="0" extension_auto="0" /> <Option output="rad" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/x64/Release/" /> <Option working_dir="../../lib/Release_x64" />
<Option type="3" /> <Option object_output="obj/Release_x64" />
<Option compiler="gcc" /> <Option type="1" />
<Option createDefFile="1" /> <Option compiler="clang" />
<Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-march=core2" />
<Add option="-O2" /> <Add option="-O2" />
<Add option="-march=core2" />
<Add option="-m64" /> <Add option="-m64" />
<Add option="-fPIC" /> <Add option="-fPIC" />
<Add option="-DNDEBUG" /> <Add option="-DNDEBUG" />
<Add option="-DANGLE_DISABLE_TRACE" /> <Add option="-DANGLE_DISABLE_TRACE" />
<Add directory="./src/GL" />
</Compiler> </Compiler>
<ResourceCompiler>
<Add directory="./src/GL" />
</ResourceCompiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
<Add option="-m64" /> <Add option="-m64" />
<Add directory="../../lib/Release_x64" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-fexceptions" /> <Add option="-fexceptions" />
<Add directory="./../include/" /> <Add directory="./src/include/" />
<Add directory="./../" />
<Add directory="./../../" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="pthread" /> <Add library="X11" />
<Add library="RAD" />
</Linker> </Linker>
<Unit filename="../common/debug.cpp" /> <Unit filename="src/app/rad_LinuxX11.cpp" />
<Unit filename="./Config.cpp" /> <Unit filename="src/app/radexample.cpp" />
<Unit filename="./Config.h" /> <Unit filename="src/app/radfnptrinit.c">
<Unit filename="./Display.cpp" /> <Option compilerVar="CC" />
<Unit filename="./Display.h" /> </Unit>
<Unit filename="./Surface.cpp" /> <Unit filename="src/app/radfnptrinit.h" />
<Unit filename="./Surface.h" /> <Unit filename="src/include/RAD/rad.h" />
<Unit filename="./libEGL.cpp" />
<Unit filename="./main.cpp" />
<Unit filename="./main.h" />
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
......
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