Skip to content

S
swiftshader
Commit 8d869e02 by Nicolas Capens Committed by Nicolas Capens
Options

Create translator libraries for the Android Emulator on Linux.

Bug 18559323 Change-Id: I9b0e57608d8a18d7137bcb1b8e0453045e214ef2 Reviewed-on: https://swiftshader-review.googlesource.com/1559Reviewed-by: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent b8df7f3b
Showing with 42 additions and 17 deletions
src/OpenGL/libEGL/libEGL.cbp
......@@ -22,6 +22,8 @@
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libEGL.so.1 ./../../../lib/Debug_x86/libEGL.so" />
<Add after="mkdir -p ./../../../lib/Debug_x86/translator/" />
<Add after="cp ./../../../lib/Debug_x86/libEGL.so.1 ./../../../lib/Debug_x86/translator/libEGL_translator.so" />
</ExtraCommands>
</Target>
<Target title="Release x86">
......@@ -43,6 +45,8 @@
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libEGL.so.1 ./../../../lib/Release_x86/libEGL.so" />
<Add after="mkdir -p ./../../../lib/Release_x86/translator/" />
<Add after="cp ./../../../lib/Release_x86/libEGL.so.1 ./../../../lib/Release_x86/translator/libEGL_translator.so" />
</ExtraCommands>
</Target>
<Target title="Debug x64">
......@@ -62,6 +66,8 @@
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libEGL.so.1 ./../../../lib/Debug_x64/libEGL.so" />
<Add after="mkdir -p ./../../../lib/Debug_x64/translator/" />
<Add after="cp ./../../../lib/Debug_x64/libEGL.so.1 ./../../../lib/Debug_x64/translator/lib64EGL_translator.so" />
</ExtraCommands>
</Target>
<Target title="Release x64">
......@@ -72,8 +78,8 @@
<Option createDefFile="1" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-march=core2" />
<Add option="-O2" />
<Add option="-march=core2" />
<Add option="-m64" />
<Add option="-fPIC" />
<Add option="-DNDEBUG" />
......@@ -85,6 +91,8 @@
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libEGL.so.1 ./../../../lib/Release_x64/libEGL.so" />
<Add after="mkdir -p ./../../../lib/Release_x64/translator/" />
<Add after="cp ./../../../lib/Release_x64/libEGL.so.1 ./../../../lib/Release_x64/translator/lib64EGL_translator.so" />
</ExtraCommands>
</Target>
</Build>
......@@ -100,6 +108,7 @@
<Add option="-Wl,--version-script=./exports.map" />
<Add option="-Wl,--hash-style=both" />
<Add library="pthread" />
<Add library="X11" />
</Linker>
<Unit filename="../../Common/SharedLibrary.hpp" />
<Unit filename="../common/debug.cpp" />
......
src/OpenGL/libEGL/main.cpp
......@@ -86,7 +86,7 @@ CONSTRUCTOR static bool eglAttachProcess()
#if defined(_WIN32)
const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "libGLES_CM_translator.dll"};
#else
const char *libGLES_CM_lib[] = {"libGLES_CM.so.1", "libGLES_CM.so"};
const char *libGLES_CM_lib[] = {"libGLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"};
#endif
libGLES_CM = loadLibrary(libGLES_CM_lib);
......@@ -96,7 +96,7 @@ CONSTRUCTOR static bool eglAttachProcess()
#if defined(_WIN32)
const char *libGLESv2_lib[] = {"libGLESv2.dll", "libGLES_V2_translator.dll"};
#else
const char *libGLESv2_lib[] = {"libGLESv2.so.2", "libGLESv2.so"};
const char *libGLESv2_lib[] = {"libGLES_V2_translator.so", "libGLESv2.so.2", "libGLESv2.so"};
#endif
libGLESv2 = loadLibrary(libGLESv2_lib);
......
src/OpenGL/libGLES_CM/libGLES_CM.cbp
......@@ -23,6 +23,8 @@
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libGLES_CM.so.1 ./../../../lib/Debug_x86/libGLES_CM.so" />
<Add after="mkdir -p ./../../../lib/Debug_x86/translator/" />
<Add after="cp ./../../../lib/Debug_x86/libGLES_CM.so.1 ./../../../lib/Debug_x86/translator/libGLES_CM_translator.so" />
</ExtraCommands>
</Target>
<Target title="Release x86">
......@@ -50,6 +52,8 @@
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libGLES_CM.so.1 ./../../../lib/Release_x86/libGLES_CM.so" />
<Add after="mkdir -p ./../../../lib/Release_x86/translator/" />
<Add after="cp ./../../../lib/Release_x86/libGLES_CM.so.1 ./../../../lib/Release_x86/translator/libGLES_CM_translator.so" />
</ExtraCommands>
</Target>
<Target title="Debug x64">
......@@ -70,6 +74,8 @@
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libGLES_CM.so.1 ./../../../lib/Debug_x64/libGLES_CM.so" />
<Add after="mkdir -p ./../../../lib/Debug_x64/translator/" />
<Add after="cp ./../../../lib/Debug_x64/libGLES_CM.so.1 ./../../../lib/Debug_x64/translator/lib64GLES_CM_translator.so" />
</ExtraCommands>
</Target>
<Target title="Release x64">
......@@ -98,6 +104,8 @@
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libGLES_CM.so.1 ./../../../lib/Release_x64/libGLES_CM.so" />
<Add after="mkdir -p ./../../../lib/Release_x64/translator/" />
<Add after="cp ./../../../lib/Release_x64/libGLES_CM.so.1 ./../../../lib/Release_x64/translator/lib64GLES_CM_translator.so" />
</ExtraCommands>
</Target>
</Build>
......@@ -144,6 +152,7 @@
<Unit filename="../../Common/MutexLock.hpp" />
<Unit filename="../../Common/Resource.cpp" />
<Unit filename="../../Common/Resource.hpp" />
<Unit filename="../../Common/SharedLibrary.hpp" />
<Unit filename="../../Common/Socket.cpp" />
<Unit filename="../../Common/Socket.hpp" />
<Unit filename="../../Common/Thread.cpp" />
......@@ -262,6 +271,8 @@
<Unit filename="Image.hpp" />
<Unit filename="IndexDataManager.cpp" />
<Unit filename="IndexDataManager.h" />
<Unit filename="MatrixStack.cpp" />
<Unit filename="MatrixStack.hpp" />
<Unit filename="RefCountObject.cpp" />
<Unit filename="RefCountObject.h" />
<Unit filename="Renderbuffer.cpp" />
......@@ -270,7 +281,6 @@
<Unit filename="ResourceManager.h" />
<Unit filename="Texture.cpp" />
<Unit filename="Texture.h" />
<Unit filename="Unknown.hpp" />
<Unit filename="VertexDataManager.cpp" />
<Unit filename="VertexDataManager.h" />
<Unit filename="libGLES_CM.cpp" />
......@@ -280,7 +290,6 @@
<Unit filename="resource.h" />
<Unit filename="utilities.cpp" />
<Unit filename="utilities.h" />
<Unit filename="vertexconversion.h" />
<Extensions>
<code_completion />
<debugger />
......
src/OpenGL/libGLES_CM/main.cpp
......@@ -46,7 +46,7 @@ CONSTRUCTOR static bool glAttachProcess()
#if defined(_WIN32)
const char *libEGL_lib[] = {"libEGL.dll", "libEGL_translator.dll"};
#else
const char *libEGL_lib[] = {"libEGL.so.1", "libEGL.so"};
const char *libEGL_lib[] = {"libEGL_translator.so", "libEGL.so.1", "libEGL.so"};
#endif
libEGL = loadLibrary(libEGL_lib);
......@@ -94,12 +94,12 @@ namespace es1
es1::Context *getContext()
{
egl::Context *context = egl::getCurrentContext();
if(context && context->getClientVersion() == 1)
{
return static_cast<es1::Context*>(context);
}
return 0;
}
......@@ -156,4 +156,4 @@ namespace egl
egl::Display *(*getCurrentDisplay)() = 0;
}
void *libEGL = 0; // Handle to the libEGL module
\ No newline at end of file
void *libEGL = 0; // Handle to the libEGL module
src/OpenGL/libGLESv2/libGLESv2.cbp
......@@ -23,6 +23,8 @@
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libGLESv2.so.2 ./../../../lib/Debug_x86/libGLESv2.so" />
<Add after="mkdir -p ./../../../lib/Debug_x86/translator/" />
<Add after="cp ./../../../lib/Debug_x86/libGLESv2.so.2 ./../../../lib/Debug_x86/translator/libGLES_V2_translator.so" />
</ExtraCommands>
</Target>
<Target title="Release x86">
......@@ -33,9 +35,9 @@
<Option createDefFile="1" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-march=i686" />
<Add option="-fomit-frame-pointer" />
<Add option="-O2" />
<Add option="-march=i686" />
<Add option="-m32" />
<Add option="-ffunction-sections" />
<Add option="-fdata-sections" />
......@@ -50,6 +52,8 @@
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libGLESv2.so.2 ./../../../lib/Release_x86/libGLESv2.so" />
<Add after="mkdir -p ./../../../lib/Release_x86/translator/" />
<Add after="cp ./../../../lib/Release_x86/libGLESv2.so.2 ./../../../lib/Release_x86/translator/libGLES_V2_translator.so" />
</ExtraCommands>
</Target>
<Target title="Debug x64">
......@@ -70,6 +74,8 @@
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libGLESv2.so.2 ./../../../lib/Debug_x64/libGLESv2.so" />
<Add after="mkdir -p ./../../../lib/Debug_x64/translator/" />
<Add after="cp ./../../../lib/Debug_x64/libGLESv2.so.2 ./../../../lib/Debug_x64/translator/lib64GLES_V2_translator.so" />
</ExtraCommands>
</Target>
<Target title="Release x64">
......@@ -80,9 +86,9 @@
<Option createDefFile="1" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-march=core2" />
<Add option="-fomit-frame-pointer" />
<Add option="-O2" />
<Add option="-march=core2" />
<Add option="-m64" />
<Add option="-fPIC" />
<Add option="-ffunction-sections" />
......@@ -98,6 +104,8 @@
</Linker>
<ExtraCommands>
<Add after="ln -s -f ./libGLESv2.so.2 ./../../../lib/Release_x64/libGLESv2.so" />
<Add after="mkdir -p ./../../../lib/Release_x64/translator/" />
<Add after="cp ./../../../lib/Release_x64/libGLESv2.so.2 ./../../../lib/Release_x64/translator/lib64GLES_V2_translator.so" />
</ExtraCommands>
</Target>
</Build>
......@@ -144,6 +152,7 @@
<Unit filename="../../Common/MutexLock.hpp" />
<Unit filename="../../Common/Resource.cpp" />
<Unit filename="../../Common/Resource.hpp" />
<Unit filename="../../Common/SharedLibrary.hpp" />
<Unit filename="../../Common/Socket.cpp" />
<Unit filename="../../Common/Socket.hpp" />
<Unit filename="../../Common/Thread.cpp" />
......
src/OpenGL/libGLESv2/main.cpp
......@@ -46,7 +46,7 @@ CONSTRUCTOR static bool glAttachProcess()
#if defined(_WIN32)
const char *libEGL_lib[] = {"libEGL.dll", "libEGL_translator.dll"};
#else
const char *libEGL_lib[] = {"libEGL.so.1", "libEGL.so"};
const char *libEGL_lib[] = {"libEGL_translator.so", "libEGL.so.1", "libEGL.so"};
#endif
libEGL = loadLibrary(libEGL_lib);
......@@ -56,7 +56,7 @@ CONSTRUCTOR static bool glAttachProcess()
#if defined(_WIN32)
const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "libGLES_CM_translator.dll"};
#else
const char *libGLES_CM_lib[] = {"libGLES_CM.so.1", "libGLES_CM.so"};
const char *libGLES_CM_lib[] = {"libGLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"};
#endif
libGLES_CM = loadLibrary(libGLES_CM_lib);
......@@ -104,12 +104,12 @@ namespace es2
es2::Context *getContext()
{
egl::Context *context = egl::getCurrentContext();
if(context && context->getClientVersion() == 2)
{
return static_cast<es2::Context*>(context);
}
return 0;
}
......
tests/third_party/PowerVR/Examples/Beginner/01_HelloAPI/OGLES2/Build/OGLES2HelloAPI.cbp
......@@ -37,7 +37,6 @@
</Target>
<Target title="Debug x64">
<Option output="bin/Debug_x64/OGLES2HelloAPI" prefix_auto="1" extension_auto="1" />
<Option working_dir="../../../../../../../../lib/Debug_x64" />
<Option object_output="obj/Debug_x64/" />
<Option type="1" />
<Option compiler="clang" />
......
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