Skip to content

S
swiftshader
Commit 36e22dea by Greg Hartman
Options

On Android: remove fallbacks that can match system libraries

Change-Id: Ieb57c03730387f04a339c2b19a7e59beb4408d19 Reviewed-on: https://swiftshader-review.googlesource.com/2770Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarGreg Hartman <ghartman@google.com>
parent b7ea984f
Showing with 5 additions and 5 deletions
src/OpenGL/libEGL/main.cpp
...@@ -86,7 +86,7 @@ CONSTRUCTOR static bool eglAttachProcess() ...@@ -86,7 +86,7 @@ CONSTRUCTOR static bool eglAttachProcess()
#if defined(_WIN32) #if defined(_WIN32)
const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "libGLES_CM_translator.dll"}; const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "libGLES_CM_translator.dll"};
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
const char *libGLES_CM_lib[] = {"/vendor/lib/egl/libGLESv1_CM_swiftshader.so", "libGLES_CM.so.1", "libGLES_CM.so"}; const char *libGLES_CM_lib[] = {"/vendor/lib/egl/libGLESv1_CM_swiftshader.so"};
#elif defined(__LP64__) #elif defined(__LP64__)
const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"}; const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"};
#else #else
...@@ -100,7 +100,7 @@ CONSTRUCTOR static bool eglAttachProcess() ...@@ -100,7 +100,7 @@ CONSTRUCTOR static bool eglAttachProcess()
#if defined(_WIN32) #if defined(_WIN32)
const char *libGLESv2_lib[] = {"libGLESv2.dll", "libGLES_V2_translator.dll"}; const char *libGLESv2_lib[] = {"libGLESv2.dll", "libGLES_V2_translator.dll"};
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
const char *libGLESv2_lib[] = {"/vendor/lib/egl/libGLESv2_swiftshader.so", "libGLESv2.so.2", "libGLESv2.so"}; const char *libGLESv2_lib[] = {"/vendor/lib/egl/libGLESv2_swiftshader.so"};
#elif defined(__LP64__) #elif defined(__LP64__)
const char *libGLESv2_lib[] = {"lib64GLES_V2_translator.so", "libGLESv2.so.2", "libGLESv2.so"}; const char *libGLESv2_lib[] = {"lib64GLES_V2_translator.so", "libGLESv2.so.2", "libGLESv2.so"};
#else #else
......
src/OpenGL/libGLES_CM/main.cpp
...@@ -46,7 +46,7 @@ CONSTRUCTOR static bool glAttachProcess() ...@@ -46,7 +46,7 @@ CONSTRUCTOR static bool glAttachProcess()
#if defined(_WIN32) #if defined(_WIN32)
const char *libEGL_lib[] = {"libEGL.dll", "libEGL_translator.dll"}; const char *libEGL_lib[] = {"libEGL.dll", "libEGL_translator.dll"};
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
const char *libEGL_lib[] = {"/vendor/lib/egl/libEGL_swiftshader.so", "libEGL.so.1", "libEGL.so"}; const char *libEGL_lib[] = {"/vendor/lib/egl/libEGL_swiftshader.so"};
#elif defined(__LP64__) #elif defined(__LP64__)
const char *libEGL_lib[] = {"lib64EGL_translator.so", "libEGL.so.1", "libEGL.so"}; const char *libEGL_lib[] = {"lib64EGL_translator.so", "libEGL.so.1", "libEGL.so"};
#else #else
......
src/OpenGL/libGLESv2/main.cpp
...@@ -46,7 +46,7 @@ CONSTRUCTOR static bool glAttachProcess() ...@@ -46,7 +46,7 @@ CONSTRUCTOR static bool glAttachProcess()
#if defined(_WIN32) #if defined(_WIN32)
const char *libEGL_lib[] = {"libEGL.dll", "libEGL_translator.dll"}; const char *libEGL_lib[] = {"libEGL.dll", "libEGL_translator.dll"};
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
const char *libEGL_lib[] = {"/vendor/lib/egl/libEGL_swiftshader.so", "libEGL.so.1", "libEGL.so"}; const char *libEGL_lib[] = {"/vendor/lib/egl/libEGL_swiftshader.so"};
#elif defined(__LP64__) #elif defined(__LP64__)
const char *libEGL_lib[] = {"lib64EGL_translator.so", "libEGL.so.1", "libEGL.so"}; const char *libEGL_lib[] = {"lib64EGL_translator.so", "libEGL.so.1", "libEGL.so"};
#else #else
...@@ -60,7 +60,7 @@ CONSTRUCTOR static bool glAttachProcess() ...@@ -60,7 +60,7 @@ CONSTRUCTOR static bool glAttachProcess()
#if defined(_WIN32) #if defined(_WIN32)
const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "libGLES_CM_translator.dll"}; const char *libGLES_CM_lib[] = {"libGLES_CM.dll", "libGLES_CM_translator.dll"};
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
const char *libGLES_CM_lib[] = {"/vendor/lib/egl/libGLESv1_CM_swiftshader.so", "libGLES_CM.so.1", "libGLES_CM.so"}; const char *libGLES_CM_lib[] = {"/vendor/lib/egl/libGLESv1_CM_swiftshader.so"};
#elif defined(__LP64__) #elif defined(__LP64__)
const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"}; const char *libGLES_CM_lib[] = {"lib64GLES_CM_translator.so", "libGLES_CM.so.1", "libGLES_CM.so"};
#else #else
......
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