From 35e25937ad05e409340e7cd356c3ce1a45a5a3f9 Mon Sep 17 00:00:00 2001
From: Ludovic Pouzenc <ludovic@pouzenc.fr>
Date: Sun, 3 Mar 2013 20:27:37 +0000
Subject: Avancee sur le C++. Boring parts disparait presque, au profit d'une
 classe OpenCLMeshKit. Il ne manque que execKernel() a code dans cette classe.
 Dans gpudataviz.cpp, il faut changer le code OpenGL pour afficher le maillage
 et pas un isodecaheron de test.

git-svn-id: file:///var/svn/2013-gpudataviz/trunk@18 371a6b4a-a258-45f8-9dcc-bdd82ce0ac9d
---
 src/boring_parts.cpp | 122 ---------------------------------------------------
 1 file changed, 122 deletions(-)

(limited to 'src/boring_parts.cpp')

diff --git a/src/boring_parts.cpp b/src/boring_parts.cpp
index 0f4ee1a..447ae60 100644
--- a/src/boring_parts.cpp
+++ b/src/boring_parts.cpp
@@ -3,26 +3,7 @@
 // TODO : only need OpenGL things, not GTK ones for now
 //#include "gtk_includes.hpp"
 
-#define RETURN_IF_FAIL(expr) do { \
-	int res=(expr); \
-	if ( res != 0 ) return res; \
-} while(0)
-
-// TODO : print streamsdk::getOpenCLErrorCodeStr(res)
-#define CL_RETURN_VAL_IF_FAIL(val, expr) do { \
-	cl_int res=(expr); \
-	if ( res != CL_SUCCESS ) {	\
-		std::cerr << "file " << __FILE__ << ": line " << __LINE__ << " (" << __PRETTY_FUNCTION__ \
-			<< "): '" << "expr" << "' failed (return code : " << res << ")" << std::endl; \
-		return val; \
-	} \
-} while(0)
-
-
 /* From http://stackoverflow.com/questions/4317062/opengl-how-to-check-if-the-user-supports-glgenbuffers
-#ifndef STRINGIFY
-  #define STRINGIFY(x) #x
-#endif
 #ifdef WIN32
   #include <windows.h>
   #define glGetProcAddress(a) wglGetProcAddress(a)
@@ -54,109 +35,6 @@
 #endif
 */
 
-#ifdef HAS_OPENCL
-int initOpenCL(intptr_t gl_display, intptr_t gl_context, intptr_t gl_vbo) {
-	cl_uint id, numPlatforms;
-	char pbuf[100];
-	std::string dTypeStr;
-	cl_platform_id *platforms, platform;
-	cl_device_id /* *devices, */device;
-	cl_context cl_ctx;
-	cl_command_queue cl_commandQueue;
-	bool usableDeviceFound=false;
-
-	// Get platform count
-	CL_RETURN_VAL_IF_FAIL(1,
-		clGetPlatformIDs(0, NULL, &numPlatforms)
-	);
-	
-	std::cout << "Detected " << numPlatforms << " platform(s)" << std::endl;
-	if ( ! ( numPlatforms > 0 ) ) return 2;
-
-	// Allocate room for all platform IDs
-	platforms = new cl_platform_id[numPlatforms];
-
-	// Get platform IDs
-	CL_RETURN_VAL_IF_FAIL(3,
-		clGetPlatformIDs(numPlatforms, platforms, &numPlatforms)
-	);
-
-	// Enumerate platforms and grab informations
-	for(id=0;id<numPlatforms;id++) {
-		cl_int res;
-		platform=platforms[id];
-
-		CL_RETURN_VAL_IF_FAIL(4,
-			clGetPlatformInfo(platform, CL_PLATFORM_VENDOR, sizeof(pbuf), pbuf, NULL)
-		);
-		std::cout << "Platform " << id << " : " << pbuf << std::endl;
-
-		// Dynamically get the function pointer for clGetGLConetextInfoKHR
-		clGetGLContextInfoKHR_fn clGetGLContextInfoKHR_proc = (clGetGLContextInfoKHR_fn) clGetExtensionFunctionAddressForPlatform(platform, "clGetGLContextInfoKHR");
-		if (!clGetGLContextInfoKHR_proc) {
-			std::cerr << "clGetExtensionFunctionAddressForPlatform(platform, clGetGLContextInfoKHR) failed" << std::endl;
-			continue;
-		}
-
-		// Try to get the device corresponding to the GL context/display on this platform
-		cl_context_properties cpsGL[] = {
-			CL_CONTEXT_PLATFORM, (cl_context_properties)platform,
-			CL_GLX_DISPLAY_KHR, gl_display,
-			CL_GL_CONTEXT_KHR, gl_context,
-			0
-		};
-
-		std::cout << "cl_context_properties cpsGL :" << std::endl;
-		std::cout << "\tCL_CONTEXT_PLATFORM :" << (void *)cpsGL[1] << std::endl;
-		std::cout << "\tCL_GLX_DISPLAY_KHR :"  << (void *)cpsGL[3] << std::endl;
-		std::cout << "\tCL_GL_CONTEXT_KHR :"   << (void *)cpsGL[5] << std::endl;
-
-    size_t deviceSize=0;
-    // get deviceSize (should be 1*sizeof(cl_device_id) with CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR)
-    res=clGetGLContextInfoKHR_proc(cpsGL,CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR,0,NULL,&deviceSize);
-    if ( res!=CL_SUCCESS || deviceSize!=1*sizeof(cl_device_id)) {
-      std::cerr << "clGetGLContextInfoKHR_proc(cpsGL,CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR,0,...) failed" << std::endl;
-			std::cerr << " (return code : " << res << ")" << std::endl;
-      continue;
-    }
-
-		device=0;
-		res=clGetGLContextInfoKHR_proc(cpsGL,CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR,deviceSize,&device,NULL);
-		if ( res!=CL_SUCCESS || device==0 ) {
-			std::cerr << "clGetGLContextInfoKHR_proc(cpsGL,CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR," << deviceSize << ",...) failed" << std::endl;
-			std::cerr << " (return code : " << res << ")" << std::endl;
-			continue;
-		}
-
-		std::cout << "cl_device :" << (void *)device << std::endl;
-
-		cl_ctx = clCreateContext(cpsGL,1,&device,0,0,&res);
-		if ( res!=CL_SUCCESS ) {
-			std::cerr << "clCreateContext() failed" << std::endl; 
-			std::cerr << " (return code : " << res << ")" << std::endl;
-			continue;
-		}
-
-		cl_commandQueue = clCreateCommandQueue(cl_ctx,device,0,&res);
-		if ( res!=CL_SUCCESS ) {
-			std::cerr << "clCreateCommandQueue() failed" << std::endl; 
-			std::cerr << " (return code : " << res << ")" << std::endl;
-			continue;
-		}
-
-		usableDeviceFound=true;
-		break;
-	}
-
-	if (! usableDeviceFound) {
-		std::cerr << "No OpenCL device has been successfully initialized" << std::endl;
-		return 1;
-	}
-		std::cout << "OpenCL initialization done." << std::endl;
-		return 0;
-}
-#endif /*HAS_OPENCL*/
-
 bool updateGLProjectionMatrix(Glib::RefPtr<Gdk::GL::Context> glCtx, Glib::RefPtr<Gdk::GL::Window> glWin, int width, int height) {
 
 	GLdouble aspect = (GLdouble) width/height;
-- 
cgit v1.2.3