intel: move intelGetGpuInfo and intelGetExtensionSupport
Move them to gpu.c.
diff --git a/icd/intel/CMakeLists.txt b/icd/intel/CMakeLists.txt
index 92e3da9..4d602a0 100644
--- a/icd/intel/CMakeLists.txt
+++ b/icd/intel/CMakeLists.txt
@@ -21,7 +21,6 @@
dispatch_tables.c
init_driver.c
gpu.c
- gpuinfo.c
obj.c
kmd/winsys_drm.c
)
diff --git a/icd/intel/dispatch_tables.c b/icd/intel/dispatch_tables.c
index f067d4d..4f84abb 100644
--- a/icd/intel/dispatch_tables.c
+++ b/icd/intel/dispatch_tables.c
@@ -23,9 +23,9 @@
*/
#include "icd.h"
-#include "dispatch_tables.h"
#include "dev.h"
-#include "gen7_functions.h"
+#include "gpu.h"
+#include "dispatch_tables.h"
static XGL_RESULT XGLAPI intelGetDeviceQueue(
XGL_DEVICE device,
diff --git a/icd/intel/gen7_functions.h b/icd/intel/gen7_functions.h
deleted file mode 100644
index e4ffa39..0000000
--- a/icd/intel/gen7_functions.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * XGL 3-D graphics library
- *
- * Copyright (C) 2014 LunarG, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Courtney Goeltzenleuchter <courtney@lunarg.com>
- */
-
-#ifndef GEN7_FUNCTIONS_H
-#define GEN7_FUNCTIONS_H
-
-#include "intel.h"
-
-XGL_RESULT XGLAPI intelGetGpuInfo(
- XGL_PHYSICAL_GPU gpu,
- XGL_PHYSICAL_GPU_INFO_TYPE infoType,
- XGL_SIZE* pDataSize,
- XGL_VOID* pData);
-
-XGL_RESULT XGLAPI intelGetExtensionSupport(
- XGL_PHYSICAL_GPU gpu,
- const XGL_CHAR* pExtName);
-
-#endif // GEN7_FUNCTIONS_H
diff --git a/icd/intel/gpu.c b/icd/intel/gpu.c
index 2aea9f3..8799f62 100644
--- a/icd/intel/gpu.c
+++ b/icd/intel/gpu.c
@@ -309,3 +309,75 @@
{
return false;
}
+
+XGL_RESULT XGLAPI intelGetGpuInfo(
+ XGL_PHYSICAL_GPU gpu_,
+ XGL_PHYSICAL_GPU_INFO_TYPE infoType,
+ XGL_SIZE* pDataSize,
+ XGL_VOID* pData)
+{
+ const struct intel_gpu *gpu = intel_gpu(gpu_);
+ XGL_RESULT ret = XGL_SUCCESS;
+
+ switch (infoType) {
+ case XGL_INFO_TYPE_PHYSICAL_GPU_PROPERTIES:
+ if (pData == NULL) {
+ return XGL_ERROR_INVALID_POINTER;
+ }
+ *pDataSize = sizeof(XGL_PHYSICAL_GPU_PROPERTIES);
+ intel_gpu_get_props(gpu, pData);
+ break;
+
+ case XGL_INFO_TYPE_PHYSICAL_GPU_PERFORMANCE:
+ if (pData == NULL) {
+ return XGL_ERROR_INVALID_POINTER;
+ }
+ *pDataSize = sizeof(XGL_PHYSICAL_GPU_PERFORMANCE);
+ intel_gpu_get_perf(gpu, pData);
+ break;
+
+ case XGL_INFO_TYPE_PHYSICAL_GPU_QUEUE_PROPERTIES:
+ /*
+ * XGL Programmers guide, page 33:
+ * to determine the data size an application calls
+ * xglGetGpuInfo() with a NULL data pointer. The
+ * expected data size for all queue property structures
+ * is returned in pDataSize
+ */
+ *pDataSize = sizeof(XGL_PHYSICAL_GPU_QUEUE_PROPERTIES) *
+ INTEL_GPU_ENGINE_COUNT;
+ if (pData != NULL) {
+ XGL_PHYSICAL_GPU_QUEUE_PROPERTIES *dst = pData;
+ int engine;
+
+ for (engine = 0; engine < INTEL_GPU_ENGINE_COUNT; engine++) {
+ intel_gpu_get_queue_props(gpu, engine, dst);
+ dst++;
+ }
+ }
+ break;
+
+ case XGL_INFO_TYPE_PHYSICAL_GPU_MEMORY_PROPERTIES:
+ if (pData == NULL) {
+ return XGL_ERROR_INVALID_POINTER;
+ }
+ *pDataSize = sizeof(XGL_PHYSICAL_GPU_MEMORY_PROPERTIES);
+ intel_gpu_get_memory_props(gpu, pData);
+ break;
+
+ default:
+ ret = XGL_ERROR_INVALID_VALUE;
+ }
+
+ return ret;
+}
+
+XGL_RESULT XGLAPI intelGetExtensionSupport(
+ XGL_PHYSICAL_GPU gpu_,
+ const XGL_CHAR* pExtName)
+{
+ struct intel_gpu *gpu = intel_gpu(gpu_);
+
+ return (intel_gpu_has_extension(gpu, (const char *) pExtName)) ?
+ XGL_SUCCESS : XGL_ERROR_INVALID_EXTENSION;
+}
diff --git a/icd/intel/gpu.h b/icd/intel/gpu.h
index a95cf31..7afa05e 100644
--- a/icd/intel/gpu.h
+++ b/icd/intel/gpu.h
@@ -93,4 +93,14 @@
bool intel_gpu_has_extension(const struct intel_gpu *gpu, const char *ext);
+XGL_RESULT XGLAPI intelGetGpuInfo(
+ XGL_PHYSICAL_GPU gpu,
+ XGL_PHYSICAL_GPU_INFO_TYPE infoType,
+ XGL_SIZE* pDataSize,
+ XGL_VOID* pData);
+
+XGL_RESULT XGLAPI intelGetExtensionSupport(
+ XGL_PHYSICAL_GPU gpu,
+ const XGL_CHAR* pExtName);
+
#endif /* GPU_H */
diff --git a/icd/intel/gpuinfo.c b/icd/intel/gpuinfo.c
deleted file mode 100644
index 52bd4e9..0000000
--- a/icd/intel/gpuinfo.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * XGL 3-D graphics library
- *
- * Copyright (C) 2014 LunarG, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- * Courtney Goeltzenleuchter <courtney@lunarg.com>
- */
-
-#include "GitSHA1.h"
-#include "gpu.h"
-#include "intel.h"
-
-XGL_RESULT XGLAPI intelGetGpuInfo(
- XGL_PHYSICAL_GPU gpu_,
- XGL_PHYSICAL_GPU_INFO_TYPE infoType,
- XGL_SIZE* pDataSize,
- XGL_VOID* pData)
-{
- const struct intel_gpu *gpu = intel_gpu(gpu_);
- XGL_RESULT ret = XGL_SUCCESS;
-
- switch (infoType) {
- case XGL_INFO_TYPE_PHYSICAL_GPU_PROPERTIES:
- if (pData == NULL) {
- return XGL_ERROR_INVALID_POINTER;
- }
- *pDataSize = sizeof(XGL_PHYSICAL_GPU_PROPERTIES);
- intel_gpu_get_props(gpu, pData);
- break;
-
- case XGL_INFO_TYPE_PHYSICAL_GPU_PERFORMANCE:
- if (pData == NULL) {
- return XGL_ERROR_INVALID_POINTER;
- }
- *pDataSize = sizeof(XGL_PHYSICAL_GPU_PERFORMANCE);
- intel_gpu_get_perf(gpu, pData);
- break;
-
- case XGL_INFO_TYPE_PHYSICAL_GPU_QUEUE_PROPERTIES:
- /*
- * XGL Programmers guide, page 33:
- * to determine the data size an application calls
- * xglGetGpuInfo() with a NULL data pointer. The
- * expected data size for all queue property structures
- * is returned in pDataSize
- */
- *pDataSize = sizeof(XGL_PHYSICAL_GPU_QUEUE_PROPERTIES) *
- INTEL_GPU_ENGINE_COUNT;
- if (pData != NULL) {
- XGL_PHYSICAL_GPU_QUEUE_PROPERTIES *dst = pData;
- int engine;
-
- for (engine = 0; engine < INTEL_GPU_ENGINE_COUNT; engine++) {
- intel_gpu_get_queue_props(gpu, engine, dst);
- dst++;
- }
- }
- break;
-
- case XGL_INFO_TYPE_PHYSICAL_GPU_MEMORY_PROPERTIES:
- if (pData == NULL) {
- return XGL_ERROR_INVALID_POINTER;
- }
- *pDataSize = sizeof(XGL_PHYSICAL_GPU_MEMORY_PROPERTIES);
- intel_gpu_get_memory_props(gpu, pData);
- break;
-
- default:
- ret = XGL_ERROR_INVALID_VALUE;
- }
-
- return ret;
-}
diff --git a/icd/intel/init_driver.c b/icd/intel/init_driver.c
index f989973..d0b8a5a 100644
--- a/icd/intel/init_driver.c
+++ b/icd/intel/init_driver.c
@@ -39,7 +39,6 @@
#include <libudev.h>
-#include "gen7_functions.h"
#include "gpu.h"
#include "intel.h"
@@ -158,13 +157,3 @@
return (count > 0) ? XGL_SUCCESS : XGL_ERROR_UNAVAILABLE;
}
-
-XGL_RESULT XGLAPI intelGetExtensionSupport(
- XGL_PHYSICAL_GPU gpu_,
- const XGL_CHAR* pExtName)
-{
- struct intel_gpu *gpu = intel_gpu(gpu_);
-
- return (intel_gpu_has_extension(gpu, (const char *) pExtName)) ?
- XGL_SUCCESS : XGL_ERROR_INVALID_EXTENSION;
-}