[arrayfire] 16/79: Graphics changes to reflect changes in upstream library forge
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Mon Jun 15 13:38:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository arrayfire.
commit c1910add2daff06ceb09e2fa63fe0d673f190153
Author: pradeep <pradeep at arrayfire.com>
Date: Thu Jun 4 16:21:19 2015 -0400
Graphics changes to reflect changes in upstream library forge
---
CMakeLists.txt | 3 +--
CMakeModules/FindForge.cmake | 15 +++++------
CMakeModules/FindGLFW.cmake | 60 ------------------------------------------
CMakeModules/build_forge.cmake | 13 ++-------
src/api/c/graphics_common.cpp | 20 +++++++-------
src/api/c/graphics_common.hpp | 8 +++---
6 files changed, 23 insertions(+), 96 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f18b7a..26f2f0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,12 +52,11 @@ IF(BUILD_GRAPHICS)
IF(FORGE_FOUND)
ADD_DEFINITIONS(-DGLEW_MX -DWITH_GRAPHICS)
INCLUDE("${CMAKE_MODULE_PATH}/FindGLEWmx.cmake")
- FIND_PACKAGE(GLFW)
INCLUDE_DIRECTORIES(
${FORGE_INCLUDE_DIRECTORIES}
${GLEW_INCLUDE_DIR}
- ${GLFW_INCLUDE_DIR})
+ )
SET(FORGE_LIBRARIES ${FORGE_LIBRARIES}
${GLEWmx_LIBRARY}
diff --git a/CMakeModules/FindForge.cmake b/CMakeModules/FindForge.cmake
index f1380fd..9ad5cde 100644
--- a/CMakeModules/FindForge.cmake
+++ b/CMakeModules/FindForge.cmake
@@ -74,15 +74,14 @@ FIND_LIBRARY(FORGE_LIBRARY
HINTS "${FORGE_PACKAGE_DIR}/lib")
INCLUDE("${CMAKE_MODULE_PATH}/FindGLEWmx.cmake")
-INCLUDE("${CMAKE_MODULE_PATH}/FindGLFW.cmake")
-IF(GLFW_FOUND AND GLEWmx_FOUND AND OPENGL_FOUND)
+IF(GLEWmx_FOUND AND OPENGL_FOUND)
IF(FORGE_INCLUDE_DIRECTORIES)
- SET(FORGE_INCLUDE_DIRECTORIES ${FORGE_INCLUDE_DIRECTORIES} ${GLFW_INCLUDE_DIR} ${GLEW_INCLUDE_DIR}
+ SET(FORGE_INCLUDE_DIRECTORIES ${FORGE_INCLUDE_DIRECTORIES} ${GLEW_INCLUDE_DIR}
CACHE INTERNAL "All include dirs required for FORGE'")
ENDIF()
IF(FORGE_LIBRARY)
- SET(FORGE_LIBRARIES ${FORGE_LIBRARY} ${GLFW_LIBRARY} ${GLEWmx_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+ SET(FORGE_LIBRARIES ${FORGE_LIBRARY} ${GLEWmx_LIBRARY} ${OPENGL_gl_LIBRARY}
CACHE INTERNAL "All libraries required for FORGE'")
ENDIF()
# handle the QUIETLY and REQUIRED arguments and set FORGE_FOUND to TRUE if
@@ -91,12 +90,10 @@ IF(GLFW_FOUND AND GLEWmx_FOUND AND OPENGL_FOUND)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(FORGE DEFAULT_MSG FORGE_LIBRARIES FORGE_INCLUDE_DIRECTORIES)
MARK_AS_ADVANCED(FORGE_LIBRARIES FORGE_INCLUDE_DIRECTORIES)
-ELSE(GLFW_FOUND AND GLEWmx_FOUND AND OPENGL_FOUND)
- IF(NOT GLFW_FOUND)
- MESSAGE(FATAL_ERROR "GLFW Not Found")
- ELSEIF(NOT GLEWmx_FOUND)
+ELSE(GLEWmx_FOUND AND OPENGL_FOUND)
+ IF(NOT GLEWmx_FOUND)
MESSAGE(FATAL_ERROR "GLEW-MX Not Found")
ELSEIF(NOT OPENGL_FOUND)
MESSAGE(FATAL_ERROR "OpenGL Not Found")
ENDIF()
-ENDIF(GLFW_FOUND AND GLEWmx_FOUND AND OPENGL_FOUND)
+ENDIF(GLEWmx_FOUND AND OPENGL_FOUND)
diff --git a/CMakeModules/FindGLFW.cmake b/CMakeModules/FindGLFW.cmake
deleted file mode 100644
index 42f1297..0000000
--- a/CMakeModules/FindGLFW.cmake
+++ /dev/null
@@ -1,60 +0,0 @@
-# Sourced from
-#https://code.google.com/p/assembly3d/
-
-# Locate the glfw library
-# This module defines the following variables:
-# GLFW_LIBRARY, the name of the library;
-# GLFW_INCLUDE_DIR, where to find glfw include files.
-# GLFW_FOUND, true if both the GLFW_LIBRARY and GLFW_INCLUDE_DIR have been found.
-#
-# To help locate the library and include file, you could define an environment variable called
-# GLFW_ROOT which points to the root of the glfw library installation. This is pretty useful
-# on a Windows platform.
-#
-#
-# Usage example to compile an "executable" target to the glfw library:
-#
-# FIND_PACKAGE (glfw REQUIRED)
-# INCLUDE_DIRECTORIES (${GLFW_INCLUDE_DIR})
-# ADD_EXECUTABLE (executable ${EXECUTABLE_SRCS})
-# TARGET_LINK_LIBRARIES (executable ${GLFW_LIBRARY})
-#
-# TODO:
-# Allow the user to select to link to a shared library or to a static library.
-
-#Search for the include file...
-FIND_PATH(GLFW_INCLUDE_DIR GLFW/glfw3.h DOC "Path to GLFW include directory."
- HINTS
- $ENV{GLFW_ROOT}
- PATH_SUFFIX include #For finding the include file under the root of the glfw expanded archive, typically on Windows.
- PATHS
- /usr/include/
- /usr/local/include/
- # By default headers are under GLFW subfolder
- /usr/include/GLFW
- /usr/local/include/GLFW
- ${GLFW_ROOT_DIR}/include/ # added by ptr
-)
-
-FIND_LIBRARY(GLFW_LIBRARY DOC "Absolute path to GLFW library."
- NAMES glfw GLFW.lib glfw3
- HINTS
- $ENV{GLFW_ROOT}
- PATH_SUFFIXES lib/win32 #For finding the library file under the root of the glfw expanded archive, typically on Windows.
- PATHS
- /usr/lib
- /usr/lib64
- /usr/lib/x86_64-linux-gnu
- /usr/lib/arm-linux-gnueabihf
- /usr/local/lib
- /usr/local/lib64
- /sw/lib
- /opt/local/lib
- ${GLFW_ROOT_DIR}/lib-msvc100/release # added by ptr
-)
-
-SET(GLFW_FOUND 0)
-IF(GLFW_LIBRARY AND GLFW_INCLUDE_DIR)
- SET(GLFW_FOUND 1)
- message(STATUS "GLFW found!")
-ENDIF(GLFW_LIBRARY AND GLFW_INCLUDE_DIR)
diff --git a/CMakeModules/build_forge.cmake b/CMakeModules/build_forge.cmake
index 7a4690a..555caa2 100644
--- a/CMakeModules/build_forge.cmake
+++ b/CMakeModules/build_forge.cmake
@@ -12,13 +12,11 @@ ELSE()
SET(byproducts BYPRODUCTS ${forge_location})
ENDIF()
-INCLUDE("${CMAKE_MODULE_PATH}/FindGLEWmx.cmake")
-FIND_PACKAGE(GLFW)
-
+# FIXME Tag forge correctly during release
ExternalProject_Add(
forge-ext
GIT_REPOSITORY https://github.com/arrayfire/forge.git
- GIT_TAG af3.0
+ GIT_TAG 22eb2aeafc4547564e7d90234320cd65f2f859fb
PREFIX "${prefix}"
INSTALL_DIR "${prefix}"
UPDATE_COMMAND ""
@@ -29,13 +27,6 @@ ExternalProject_Add(
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-DBUILD_EXAMPLES:BOOL=OFF
- -DUSE_GLEWmx_STATIC:BOOL=${USE_GLEWmx_STATIC}
- -DGLEW_INCLUDE_DIR:PATH=${GLEW_INCLUDE_DIR}
- -DGLEW_LIBRARY:FILEPATH=${GLEW_LIBRARY}
- -DGLEWmxd_LIBRARY:FILEPATH=${GLEWmxd_LIBRARY}
- -DGLEWmxs_LIBRARY:FILEPATH=${GLEWmxs_LIBRARY}
- -DGLFW_INCLUDE_DIR:PATH=${GLFW_INCLUDE_DIR}
- -DGLFW_LIBRARY:FILEPATH=${GLFW_LIBRARY}
${byproducts}
)
diff --git a/src/api/c/graphics_common.cpp b/src/api/c/graphics_common.cpp
index 2c86192..bec27fe 100644
--- a/src/api/c/graphics_common.cpp
+++ b/src/api/c/graphics_common.cpp
@@ -19,14 +19,14 @@ using namespace std;
template<typename T>
GLenum getGLType() { return GL_FLOAT; }
-#define INSTANTIATE_GET_GL_TYPE(T, OpenGLEnum)\
- template<> GLenum getGLType<T>() { return OpenGLEnum; }
+#define INSTANTIATE_GET_FG_TYPE(T, ForgeEnum)\
+ template<> fg::FGType getGLType<T>() { return ForgeEnum; }
-INSTANTIATE_GET_GL_TYPE(float, GL_FLOAT);
-INSTANTIATE_GET_GL_TYPE(int , GL_INT);
-INSTANTIATE_GET_GL_TYPE(unsigned, GL_UNSIGNED_INT);
-INSTANTIATE_GET_GL_TYPE(char, GL_BYTE);
-INSTANTIATE_GET_GL_TYPE(unsigned char, GL_UNSIGNED_BYTE);
+INSTANTIATE_GET_FG_TYPE(float, fg::FG_FLOAT);
+INSTANTIATE_GET_FG_TYPE(int , fg::FG_INT);
+INSTANTIATE_GET_FG_TYPE(unsigned, fg::FG_UNSIGNED_INT);
+INSTANTIATE_GET_FG_TYPE(char, fg::FG_BYTE);
+INSTANTIATE_GET_FG_TYPE(unsigned char, fg::FG_UNSIGNED_BYTE);
GLenum glErrorSkip(const char *msg, const char* file, int line)
{
@@ -136,7 +136,7 @@ fg::Window* ForgeManager::getMainWindow(const bool dontCreate)
return wnd;
}
-fg::Image* ForgeManager::getImage(int w, int h, fg::ColorMode mode, GLenum type)
+fg::Image* ForgeManager::getImage(int w, int h, fg::ColorMode mode, fg::FGType type)
{
/* w, h needs to fall in the range of [0, 2^16]
* for the ForgeManager to correctly retrieve
@@ -157,7 +157,7 @@ fg::Image* ForgeManager::getImage(int w, int h, fg::ColorMode mode, GLenum type)
return mImgMap[key];
}
-fg::Plot* ForgeManager::getPlot(int nPoints, GLenum type)
+fg::Plot* ForgeManager::getPlot(int nPoints, fg::FGType type)
{
/* nPoints needs to fall in the range of [0, 2^48]
* for the ForgeManager to correctly retrieve
@@ -176,7 +176,7 @@ fg::Plot* ForgeManager::getPlot(int nPoints, GLenum type)
return mPltMap[key];
}
-fg::Histogram* ForgeManager::getHistogram(int nBins, GLenum type)
+fg::Histogram* ForgeManager::getHistogram(int nBins, fg::FGType type)
{
/* nBins needs to fall in the range of [0, 2^48]
* for the ForgeManager to correctly retrieve
diff --git a/src/api/c/graphics_common.hpp b/src/api/c/graphics_common.hpp
index 54984cb..ac6f4c0 100644
--- a/src/api/c/graphics_common.hpp
+++ b/src/api/c/graphics_common.hpp
@@ -18,7 +18,7 @@
// default to f32(float) type
template<typename T>
-GLenum getGLType();
+fg::FGType getGLType();
// Print for OpenGL errors
// Returns 1 if an OpenGL error occurred, 0 otherwise.
@@ -73,9 +73,9 @@ class ForgeManager
fg::Font* getFont(const bool dontCreate=false);
fg::Window* getMainWindow(const bool dontCreate=false);
- fg::Image* getImage(int w, int h, fg::ColorMode mode, GLenum type);
- fg::Plot* getPlot(int nPoints, GLenum type);
- fg::Histogram* getHistogram(int nBins, GLenum type);
+ fg::Image* getImage(int w, int h, fg::ColorMode mode, fg::FGType type);
+ fg::Plot* getPlot(int nPoints, fg::FGType type);
+ fg::Histogram* getHistogram(int nBins, fg::FGType type);
protected:
ForgeManager() {}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git
More information about the debian-science-commits
mailing list