From ed0f222a91a3326aa1c88b472204e469283a5c35 Mon Sep 17 00:00:00 2001 From: bsegovia Date: Thu, 28 Jul 2011 06:21:03 +0000 Subject: [PATCH] Removed genx_driver.* --- src/CMakeLists.txt | 1 - src/intel/cl_device_data.h | 8 --- src/intel/genx_driver.c | 146 --------------------------------------------- src/intel/genx_driver.h | 38 ------------ 4 files changed, 193 deletions(-) delete mode 100644 src/intel/genx_driver.c delete mode 100644 src/intel/genx_driver.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ed8b388..71f2ea8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,6 @@ SET(OPENCL_SRC cl_device_id.c cl_context.c cl_command_queue.c - intel/genx_driver.c intel/intel_gpgpu.c intel/intel_batchbuffer.c intel/intel_driver.c diff --git a/src/intel/cl_device_data.h b/src/intel/cl_device_data.h index b7faef1..2082cf1 100644 --- a/src/intel/cl_device_data.h +++ b/src/intel/cl_device_data.h @@ -80,19 +80,11 @@ #define IS_IVYBRIDGE(devid) (IS_IVB_GT1(devid) || IS_IVB_GT2(devid)) #define IS_GEN7(devid) IS_IVYBRIDGE(devid) -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - /* Open a connection to the X server and ask the kernel who we are. Returns -1 * if no Intel GPU was found or an error was encountered in the probing * process */ extern int cl_intel_get_device_id(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - #endif /* __CL_DEVICE_DATA_H__ */ diff --git a/src/intel/genx_driver.c b/src/intel/genx_driver.c deleted file mode 100644 index 8f76ede..0000000 --- a/src/intel/genx_driver.c +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Copyright © 2012 Intel Corporation - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - * - * Author: Benjamin Segovia - */ - -#include "intel/intel_gpgpu.h" -#include "intel/genx_driver.h" -#include "x11/dricommon.h" - -#include "cl_utils.h" -#include "cl_alloc.h" -#include "cl_genx_driver.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -LOCAL void -genx_driver_delete(genx_driver_t *driver) -{ - if (driver == NULL) - return; - cl_free(driver); -} - -LOCAL genx_driver_t* -genx_driver_new(void) -{ - genx_driver_t *driver = NULL; - - TRY_ALLOC_NO_ERR (driver, CALLOC(genx_driver_t)); - driver->intel.fd = -1; - -exit: - return driver; -error: - genx_driver_delete(driver); - driver = NULL; - goto exit; -} - -LOCAL void -genx_driver_init(genx_driver_t *genx) -{ - int cardi; - genx->x11_display = XOpenDisplay(":0.0"); - - if(genx->x11_display) { - if((genx->dri_ctx = getDRI2State(genx->x11_display, - DefaultScreen(genx->x11_display), - NULL))) - intel_driver_init_shared(&genx->intel, genx->dri_ctx); - else - printf("X server found. dri2 connection failed! \n"); - } else { - printf("Can't find X server!\n"); - } - - if(!intel_driver_is_active(&genx->intel)) { - printf("Trying to open directly..."); - char card_name[20]; - for(cardi = 0; cardi < 16; cardi++) { - sprintf(card_name, "/dev/dri/card%d", cardi); - if(intel_driver_init_master(&genx->intel, card_name)) { - printf("Success at %s.\n", card_name); - break; - } - } - } - if(!intel_driver_is_active(&genx->intel)) { - printf("Device open failed.\n"); - exit(-1); - } -} - -LOCAL void -genx_driver_terminate(genx_driver_t *genx) -{ - if(genx->dri_ctx) dri_state_release(genx->dri_ctx); - if(genx->x11_display) XCloseDisplay(genx->x11_display); - genx->dri_ctx = NULL; - genx->x11_display = NULL; -} -#if 0 -LOCAL int -cl_intel_get_device_id(void) -{ - genx_driver_t *driver = NULL; - int intel_device_id; - - driver = genx_driver_new(); - assert(driver != NULL); - genx_driver_init(driver); - intel_device_id = driver->intel.device_id; - genx_driver_terminate(driver); - genx_driver_delete(driver); - - return intel_device_id; -} - -LOCAL genx_driver_t* -cl_genx_driver_new(void) -{ - genx_driver_t *driver = NULL; - TRY_ALLOC_NO_ERR (driver, genx_driver_new()); - genx_driver_init(driver); - -exit: - return driver; -error: - cl_genx_driver_delete(driver); - driver = NULL; - goto exit; -} - -LOCAL void -cl_genx_driver_delete(genx_driver_t *driver) -{ - if (driver == NULL) - return; - genx_driver_terminate(driver); - genx_driver_delete(driver); -} -#endif - diff --git a/src/intel/genx_driver.h b/src/intel/genx_driver.h deleted file mode 100644 index 88b15ee..0000000 --- a/src/intel/genx_driver.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright © 2012 Intel Corporation - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - * - * Author: Benjamin Segovia - */ - -#ifndef _GENX_DRIVER_H_ -#define _GENX_DRIVER_H_ - -#include "intel_driver.h" -#include - -/* Provides more functionnalitites to setup gen state while using X */ -typedef struct genx_driver -{ - intel_driver_t intel; - Display *x11_display; - struct dri_state *dri_ctx; -} genx_driver_t; - -extern void genx_driver_init(genx_driver_t*); -extern void genx_driver_terminate(genx_driver_t*); - -#endif /* _GENX_DRIVER_H_ */ - -- 2.7.4