diff options
| author | 2014-05-19 13:51:59 -0700 | |
|---|---|---|
| committer | 2014-05-19 13:51:59 -0700 | |
| commit | 71b8789803e801dae6eae081c741523c62e071cd (patch) | |
| tree | 44fad371fa32b95b3755e4be4d3028018d3d6fb2 | |
| parent | Indent fixes (diff) | |
| download | yuzu-71b8789803e801dae6eae081c741523c62e071cd.tar.gz yuzu-71b8789803e801dae6eae081c741523c62e071cd.tar.xz yuzu-71b8789803e801dae6eae081c741523c62e071cd.zip | |
Indent fixes
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | externals/cmake-modules/FindGLEW.cmake | 58 | ||||
| -rw-r--r-- | src/video_core/utils.cpp | 62 |
3 files changed, 61 insertions, 61 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f7ea1949b..b4665640c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -23,7 +23,7 @@ pkg_search_module(GLFW REQUIRED glfw3) | |||
| 23 | IF (APPLE) | 23 | IF (APPLE) |
| 24 | FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation) | 24 | FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation) |
| 25 | SET(CMAKE_CXX_FLAGS "-stdlib=libc++") | 25 | SET(CMAKE_CXX_FLAGS "-stdlib=libc++") |
| 26 | SET(CMAKE_EXE_LINKER_FLAGS "-stdlib=libc++") | 26 | SET(CMAKE_EXE_LINKER_FLAGS "-stdlib=libc++") |
| 27 | ENDIF (APPLE) | 27 | ENDIF (APPLE) |
| 28 | 28 | ||
| 29 | #external includes | 29 | #external includes |
diff --git a/externals/cmake-modules/FindGLEW.cmake b/externals/cmake-modules/FindGLEW.cmake index c95d558b6..105e30eb0 100644 --- a/externals/cmake-modules/FindGLEW.cmake +++ b/externals/cmake-modules/FindGLEW.cmake | |||
| @@ -8,40 +8,40 @@ | |||
| 8 | # | 8 | # |
| 9 | 9 | ||
| 10 | IF (WIN32) | 10 | IF (WIN32) |
| 11 | FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h | 11 | FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h |
| 12 | $ENV{PROGRAMFILES}/GLEW/include | 12 | $ENV{PROGRAMFILES}/GLEW/include |
| 13 | ${PROJECT_SOURCE_DIR}/src/nvgl/glew/include | 13 | ${PROJECT_SOURCE_DIR}/src/nvgl/glew/include |
| 14 | DOC "The directory where GL/glew.h resides") | 14 | DOC "The directory where GL/glew.h resides") |
| 15 | FIND_LIBRARY( GLEW_LIBRARY | 15 | FIND_LIBRARY( GLEW_LIBRARY |
| 16 | NAMES glew GLEW glew32 glew32s | 16 | NAMES glew GLEW glew32 glew32s |
| 17 | PATHS | 17 | PATHS |
| 18 | $ENV{PROGRAMFILES}/GLEW/lib | 18 | $ENV{PROGRAMFILES}/GLEW/lib |
| 19 | ${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin | 19 | ${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin |
| 20 | ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib | 20 | ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib |
| 21 | DOC "The GLEW library") | 21 | DOC "The GLEW library") |
| 22 | ELSE (WIN32) | 22 | ELSE (WIN32) |
| 23 | FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h | 23 | FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h |
| 24 | /usr/include | 24 | /usr/include |
| 25 | /usr/local/include | 25 | /usr/local/include |
| 26 | /sw/include | 26 | /sw/include |
| 27 | /opt/local/include | 27 | /opt/local/include |
| 28 | DOC "The directory where GL/glew.h resides") | 28 | DOC "The directory where GL/glew.h resides") |
| 29 | FIND_LIBRARY( GLEW_LIBRARY | 29 | FIND_LIBRARY( GLEW_LIBRARY |
| 30 | NAMES GLEW glew | 30 | NAMES GLEW glew |
| 31 | PATHS | 31 | PATHS |
| 32 | /usr/lib64 | 32 | /usr/lib64 |
| 33 | /usr/lib | 33 | /usr/lib |
| 34 | /usr/local/lib64 | 34 | /usr/local/lib64 |
| 35 | /usr/local/lib | 35 | /usr/local/lib |
| 36 | /sw/lib | 36 | /sw/lib |
| 37 | /opt/local/lib | 37 | /opt/local/lib |
| 38 | DOC "The GLEW library") | 38 | DOC "The GLEW library") |
| 39 | ENDIF (WIN32) | 39 | ENDIF (WIN32) |
| 40 | 40 | ||
| 41 | IF (GLEW_INCLUDE_PATH) | 41 | IF (GLEW_INCLUDE_PATH) |
| 42 | SET( GLEW_FOUND 1 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise") | 42 | SET( GLEW_FOUND 1 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise") |
| 43 | ELSE (GLEW_INCLUDE_PATH) | 43 | ELSE (GLEW_INCLUDE_PATH) |
| 44 | SET( GLEW_FOUND 0 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise") | 44 | SET( GLEW_FOUND 0 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise") |
| 45 | ENDIF (GLEW_INCLUDE_PATH) | 45 | ENDIF (GLEW_INCLUDE_PATH) |
| 46 | 46 | ||
| 47 | MARK_AS_ADVANCED( GLEW_FOUND ) | 47 | MARK_AS_ADVANCED( GLEW_FOUND ) |
diff --git a/src/video_core/utils.cpp b/src/video_core/utils.cpp index 29382c814..a90fc183b 100644 --- a/src/video_core/utils.cpp +++ b/src/video_core/utils.cpp | |||
| @@ -8,37 +8,37 @@ | |||
| 8 | #include "video_core/utils.h" | 8 | #include "video_core/utils.h" |
| 9 | 9 | ||
| 10 | namespace VideoCore { | 10 | namespace VideoCore { |
| 11 | /** | 11 | /** |
| 12 | * Dumps a texture to TGA | 12 | * Dumps a texture to TGA |
| 13 | * @param filename String filename to dump texture to | 13 | * @param filename String filename to dump texture to |
| 14 | * @param width Width of texture in pixels | 14 | * @param width Width of texture in pixels |
| 15 | * @param height Height of texture in pixels | 15 | * @param height Height of texture in pixels |
| 16 | * @param raw_data Raw RGBA8 texture data to dump | 16 | * @param raw_data Raw RGBA8 texture data to dump |
| 17 | * @todo This should be moved to some general purpose/common code | 17 | * @todo This should be moved to some general purpose/common code |
| 18 | */ | 18 | */ |
| 19 | void DumpTGA(std::string filename, int width, int height, u8* raw_data) { | 19 | void DumpTGA(std::string filename, int width, int height, u8* raw_data) { |
| 20 | TGAHeader hdr; | 20 | TGAHeader hdr; |
| 21 | FILE* fout; | 21 | FILE* fout; |
| 22 | u8 r, g, b; | 22 | u8 r, g, b; |
| 23 | 23 | ||
| 24 | memset(&hdr, 0, sizeof(hdr)); | 24 | memset(&hdr, 0, sizeof(hdr)); |
| 25 | hdr.datatypecode = 2; // uncompressed RGB | 25 | hdr.datatypecode = 2; // uncompressed RGB |
| 26 | hdr.bitsperpixel = 24; // 24 bpp | 26 | hdr.bitsperpixel = 24; // 24 bpp |
| 27 | hdr.width = width; | 27 | hdr.width = width; |
| 28 | hdr.height = height; | 28 | hdr.height = height; |
| 29 | 29 | ||
| 30 | fout = fopen(filename.c_str(), "wb"); | 30 | fout = fopen(filename.c_str(), "wb"); |
| 31 | fwrite(&hdr, sizeof(TGAHeader), 1, fout); | 31 | fwrite(&hdr, sizeof(TGAHeader), 1, fout); |
| 32 | for (int i = 0; i < height; i++) { | 32 | for (int i = 0; i < height; i++) { |
| 33 | for (int j = 0; j < width; j++) { | 33 | for (int j = 0; j < width; j++) { |
| 34 | b = raw_data[(3 * (i * width)) + (3 * j) + 0]; | 34 | b = raw_data[(3 * (i * width)) + (3 * j) + 0]; |
| 35 | g = raw_data[(3 * (i * width)) + (3 * j) + 1]; | 35 | g = raw_data[(3 * (i * width)) + (3 * j) + 1]; |
| 36 | r = raw_data[(3 * (i * width)) + (3 * j) + 2]; | 36 | r = raw_data[(3 * (i * width)) + (3 * j) + 2]; |
| 37 | putc(b, fout); | 37 | putc(b, fout); |
| 38 | putc(g, fout); | 38 | putc(g, fout); |
| 39 | putc(r, fout); | 39 | putc(r, fout); |
| 40 | } | ||
| 41 | } | 40 | } |
| 42 | fclose(fout); | ||
| 43 | } | 41 | } |
| 42 | fclose(fout); | ||
| 43 | } | ||
| 44 | } // namespace \ No newline at end of file | 44 | } // namespace \ No newline at end of file |