Changing the build a bit to support GLES3

CMakeLists.txt

@@ -67,11 +67,6 @@ ENDIF()
 SET(ANKI_WINDOW_BACKEND "GLXX11" CACHE STRING "The window backend (GLXX11 or EGLX11 or EGLFBDEV or DUMMY)")
 MESSAGE("++ AnKi window backend: ${ANKI_WINDOW_BACKEND}")
 
-IF(ANKI_WINDOW_BACKEND STREQUAL "EGLFBDEV")
-	SET(ANKI_FBDEV_INCLUDE_DIRS CACHE STRING "The include paths for FBDEV")
-	SET(ANKI_FBDEV_LIB_DIRS CACHE STRING "The lib paths for FBDEV")
-ENDIF()
-
 #
 # Common compiler flags
 #
@@ -149,9 +144,18 @@ ENDIF()
 #
 # Include & lib directories
 #
-INCLUDE_DIRECTORIES("extern/GLEW/include" "extern/tinyxml2/include" "extern/lua" "extern/png" "extern/bullet" "include"
+SET(ANKI_EXTRA_INCLUDE_DIRS CACHE STRING "Some extra include paths (Needed for FBDEV)")
+SET(ANKI_EXTRA_LIB_DIRS CACHE STRING "Some extra lib paths (Needed for FBDEV)")
+
+INCLUDE_DIRECTORIES("extern/tinyxml2/include" "extern/lua" "extern/png" "extern/bullet" "include"
 	"${CMAKE_CURRENT_BINARY_DIR}")
 
+IF(ANKI_WINDOW_BACKEND STREQUAL "GLXX11")
+	INCLUDE_DIRECTORIES("extern/GLEW/include")
+ELSE()
+	INCLUDE_DIRECTORIES("extern/GLES3/include")
+ENDIF()
+
 # Add a few compiler specific stuff 
 IF(${CMAKE_CXX_COMPILER} MATCHES ".*clang\\+\\+$")	
 	INCLUDE_DIRECTORIES("/opt/libcxx/include/c++/v1")

build/clean

@@ -1,2 +1,2 @@
 #!/bin/bash
-ls | xargs -I % echo % | grep -v clean | grep -v genmakefiledbg | xargs -I % rm -rf %
+ls | xargs -I % echo % | grep -v clean | grep -v genmakefiledbg | grep -v genmakefilevithar | xargs -I % rm -rf %

include/anki/gl/Ogl.h

@@ -1,9 +1,13 @@
 #ifndef ANKI_GL_OGL_H
 #define ANKI_GL_OGL_H
 
-#include <GL/glew.h>
-#if !defined(ANKI_GLEW_H)
-#	error "Wrong GLEW included"
+#if ANKI_WINDOW_BACKEND_GLXX11
+#	include <GL/glew.h>
+#	if !defined(ANKI_GLEW_H)
+#		error "Wrong GLEW included"
+#	endif
+#else
+#	include <GLES3/gl3.h>
 #endif
 
 // The following macros are used for sanity checks in non sharable GL objects.

include/anki/gl/Vbo.h

@@ -24,8 +24,8 @@ public:
 	/// GL_ELEMENT_ARRAY_BUFFER targets
 	static void unbindAllTargets()
 	{
-		glBindBufferARB(GL_ARRAY_BUFFER, 0);
-		glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER, 0);
+		glBindBuffer(GL_ARRAY_BUFFER, 0);
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
 	}
 
 	/// The same as BufferObject::create but it only accepts

include/anki/util/Platform.h

@@ -1,32 +0,0 @@
-#ifndef ANKI_UTIL_PLATFORM_H
-#define ANKI_UTIL_PLATFORM_H
-
-//
-// Compiler
-//
-
-#if defined(__GNUC__)
-#	if defined(__clang__)
-#		define ANKI_COMPILER_CLANG 1
-#	else
-#		define ANKI_COMPILER_GCC 1
-#	endif
-#else
-#	define ANKI_COMPILER_UNKNOWN
-#endif
-
-//
-// Platform
-//
-
-#if defined(__gnu_linux__)
-#	define ANKI_PLATFORM_LINUX 1
-#elif defined(__WIN32__) || defined(_WIN32)
-#	define ANKI_PLATFORM_WINDOWS 1
-#elif defined(__APPLE_CC__)
-#	define ANKI_PLATFORM_APPLE 1
-#else
-#	define ANKI_PLATFORM_UNKNOWN 1
-#endif
-
-#endif

src/core/App.cpp

@@ -1,10 +1,8 @@
 #include "anki/core/App.h"
 #include "anki/core/Logger.h"
 #include "anki/util/Exception.h"
-#include "anki/util/Platform.h"
 #include "anki/util/Filesystem.h"
 #include "anki/Config.h"
-#include "anki/util/Platform.h"
 #include <cstring>
 #include <sstream>
 #include <iostream>
@@ -117,8 +115,7 @@ void App::printAppInfo()
 {
 	std::stringstream msg;
 	msg << "App info: ";
-	msg << "Version " << ANKI_VERSION_MAJOR << "." << ANKI_VERSION_MINOR 
-		<< ", ";
+	msg << "AnKi " << ANKI_VERSION_MAJOR << "." << ANKI_VERSION_MINOR << ", ";
 #if NDEBUG
 	msg << "Release";
 #else
@@ -126,18 +123,6 @@ void App::printAppInfo()
 #endif
 	msg << " build, ";
 
-	msg << "platform " << 
-#if ANKI_PLATFORM_LINUX
-	"Linux"
-#elif ANKI_PLATFORM_WINDOWS
-	"Windows"
-#elif ANKI_PLATFORM_APPLE
-	"Apple"
-#else
-#	error "See file"
-#endif
-	<< ", ";
-
 	msg << "build date " __DATE__ ", " << "rev " << ANKI_REVISION;
 
 	ANKI_LOGI(msg.str());