From db39e7f5dd38c5bdbff08c929288350e643eb0bc Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Mon, 25 May 2015 09:51:24 -0400 Subject: [PATCH] Rename path_utils to system_utils For inclusion of Sleep BUG=angleproject:892 Change-Id: I1a9491102e9943d945eef0ba372a6779c30cd311 Reviewed-on: https://chromium-review.googlesource.com/273131 Reviewed-by: Geoff Lang Tested-by: Corentin Wallez --- samples/multi_texture/MultiTexture.cpp | 7 ++++--- .../multiple_draw_buffers/MultipleDrawBuffers.cpp | 10 +++++----- samples/particle_system/ParticleSystem.cpp | 4 ++-- .../{Linux_path_utils.cpp => Linux_system_utils.cpp} | 9 +++++++-- util/{path_utils.h => system_utils.h} | 7 +++++++ util/util.gyp | 8 ++++---- .../{Win32_path_utils.cpp => Win32_system_utils.cpp} | 12 +++++++++--- 7 files changed, 38 insertions(+), 19 deletions(-) rename util/linux/{Linux_path_utils.cpp => Linux_system_utils.cpp} (86%) rename util/{path_utils.h => system_utils.h} (77%) rename util/win32/{Win32_path_utils.cpp => Win32_system_utils.cpp} (83%) diff --git a/samples/multi_texture/MultiTexture.cpp b/samples/multi_texture/MultiTexture.cpp index 97c4d436b..1d265b940 100644 --- a/samples/multi_texture/MultiTexture.cpp +++ b/samples/multi_texture/MultiTexture.cpp @@ -14,9 +14,10 @@ // http://www.opengles-book.com #include "SampleApplication.h" + #include "shader_utils.h" +#include "system_utils.h" #include "tga_utils.h" -#include "path_utils.h" class MultiTextureSample : public SampleApplication { @@ -83,8 +84,8 @@ class MultiTextureSample : public SampleApplication mLightMapLoc = glGetUniformLocation(mProgram, "s_lightMap"); // Load the textures - mBaseMapTexID = loadTexture(GetExecutableDirectory() + "/basemap.tga"); - mLightMapTexID = loadTexture(GetExecutableDirectory() + "/lightmap.tga"); + mBaseMapTexID = loadTexture(angle::GetExecutableDirectory() + "/basemap.tga"); + mLightMapTexID = loadTexture(angle::GetExecutableDirectory() + "/lightmap.tga"); if (mBaseMapTexID == 0 || mLightMapTexID == 0) { return false; diff --git a/samples/multiple_draw_buffers/MultipleDrawBuffers.cpp b/samples/multiple_draw_buffers/MultipleDrawBuffers.cpp index 3735de8d7..9ac977125 100644 --- a/samples/multiple_draw_buffers/MultipleDrawBuffers.cpp +++ b/samples/multiple_draw_buffers/MultipleDrawBuffers.cpp @@ -15,7 +15,7 @@ #include "SampleApplication.h" #include "shader_utils.h" -#include "path_utils.h" +#include "system_utils.h" #include "texture_utils.h" #include @@ -49,15 +49,15 @@ class MultipleDrawBuffersSample : public SampleApplication return false; } - mMRTProgram = CompileProgramFromFiles(GetExecutableDirectory() + "/multiple_draw_buffers_vs.glsl", - GetExecutableDirectory() + "/multiple_draw_buffers_fs.glsl"); + mMRTProgram = CompileProgramFromFiles(angle::GetExecutableDirectory() + "/multiple_draw_buffers_vs.glsl", + angle::GetExecutableDirectory() + "/multiple_draw_buffers_fs.glsl"); if (!mMRTProgram) { return false; } - mCopyProgram = CompileProgramFromFiles(GetExecutableDirectory() + "/multiple_draw_buffers_vs.glsl", - GetExecutableDirectory() + "/multiple_draw_buffers_copy_fs.glsl"); + mCopyProgram = CompileProgramFromFiles(angle::GetExecutableDirectory() + "/multiple_draw_buffers_vs.glsl", + angle::GetExecutableDirectory() + "/multiple_draw_buffers_copy_fs.glsl"); if (!mCopyProgram) { return false; diff --git a/samples/particle_system/ParticleSystem.cpp b/samples/particle_system/ParticleSystem.cpp index 1c0159e32..ab54cc373 100644 --- a/samples/particle_system/ParticleSystem.cpp +++ b/samples/particle_system/ParticleSystem.cpp @@ -17,8 +17,8 @@ #include "Vector.h" #include "shader_utils.h" #include "random_utils.h" +#include "system_utils.h" #include "tga_utils.h" -#include "path_utils.h" #define _USE_MATH_DEFINES #include @@ -114,7 +114,7 @@ class ParticleSystemSample : public SampleApplication mParticleTime = 1.0f; TGAImage img; - if (!LoadTGAImageFromFile(GetExecutableDirectory() + "/smoke.tga", &img)) + if (!LoadTGAImageFromFile(angle::GetExecutableDirectory() + "/smoke.tga", &img)) { return false; } diff --git a/util/linux/Linux_path_utils.cpp b/util/linux/Linux_system_utils.cpp similarity index 86% rename from util/linux/Linux_path_utils.cpp rename to util/linux/Linux_system_utils.cpp index 65aa9579d..697cae577 100644 --- a/util/linux/Linux_path_utils.cpp +++ b/util/linux/Linux_system_utils.cpp @@ -4,14 +4,17 @@ // found in the LICENSE file. // -// Linux_path_utils.cpp: Implementation of OS-specific path functions for Linux +// Linux_system_utils.cpp: Implementation of OS-specific functions for Linux -#include "path_utils.h" +#include "system_utils.h" #include #include #include +namespace angle +{ + std::string GetExecutablePath() { // We cannot use lstat to get the size of /proc/self/exe as it always returns 0 @@ -34,3 +37,5 @@ std::string GetExecutableDirectory() size_t lastPathSepLoc = executablePath.find_last_of("/"); return (lastPathSepLoc != std::string::npos) ? executablePath.substr(0, lastPathSepLoc) : ""; } + +} // namespace angle diff --git a/util/path_utils.h b/util/system_utils.h similarity index 77% rename from util/path_utils.h rename to util/system_utils.h index 430abfadf..89ef615a2 100644 --- a/util/path_utils.h +++ b/util/system_utils.h @@ -4,12 +4,19 @@ // found in the LICENSE file. // +// system_utils.h: declaration of OS-specific utility functions + #ifndef SAMPLE_UTIL_PATH_UTILS_H #define SAMPLE_UTIL_PATH_UTILS_H #include +namespace angle +{ + std::string GetExecutablePath(); std::string GetExecutableDirectory(); +} // namespace angle + #endif // SAMPLE_UTIL_PATH_UTILS_H diff --git a/util/util.gyp b/util/util.gyp index 213ea56dc..6c1df012f 100644 --- a/util/util.gyp +++ b/util/util.gyp @@ -10,21 +10,21 @@ 'com_utils.h', 'keyboard.h', 'mouse.h', - 'path_utils.h', 'random_utils.cpp', 'random_utils.h', 'shader_utils.cpp', 'shader_utils.h', + 'system_utils.h', + 'Event.h', 'EGLWindow.cpp', 'EGLWindow.h', - 'Event.h', 'OSWindow.cpp', 'OSWindow.h', 'Timer.h', ], 'util_win32_sources': [ - 'win32/Win32_path_utils.cpp', + 'win32/Win32_system_utils.cpp', 'win32/Win32Timer.cpp', 'win32/Win32Timer.h', 'win32/Win32Window.cpp', @@ -32,7 +32,7 @@ ], 'util_linux_sources': [ - 'linux/Linux_path_utils.cpp', + 'linux/Linux_system_utils.cpp', 'linux/LinuxTimer.cpp', 'linux/LinuxTimer.h', 'x11/X11Window.cpp', diff --git a/util/win32/Win32_path_utils.cpp b/util/win32/Win32_system_utils.cpp similarity index 83% rename from util/win32/Win32_path_utils.cpp rename to util/win32/Win32_system_utils.cpp index 73c955836..9f6f9266c 100644 --- a/util/win32/Win32_path_utils.cpp +++ b/util/win32/Win32_system_utils.cpp @@ -4,11 +4,15 @@ // found in the LICENSE file. // -// Win32_path_utils.cpp: Implementation of OS-specific path functions for Windows +// Win32_system_utils.cpp: Implementation of OS-specific functions for Windows + +#include "system_utils.h" -#include "path_utils.h" -#include #include +#include + +namespace angle +{ std::string GetExecutablePath() { @@ -23,3 +27,5 @@ std::string GetExecutableDirectory() size_t lastPathSepLoc = executablePath.find_last_of("\\/"); return (lastPathSepLoc != std::string::npos) ? executablePath.substr(0, lastPathSepLoc) : ""; } + +} // namespace angle