Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / gpu / config / gpu_info_collector.h

diff --git a/src/gpu/config/gpu_info_collector.h b/src/gpu/config/gpu_info_collector.h
index f3d339e..ad3ae95 100644 (file)
--- a/src/gpu/config/gpu_info_collector.h
+++ b/src/gpu/config/gpu_info_collector.h
@@ -12,26 +12,8 @@
 
 namespace gpu {
 
-enum GpuIDResult {
-  kGpuIDFailure,
-  kGpuIDSuccess,
-  kGpuIDNotSupported
-};
-
-// Result for the various Collect*Info* functions below.
-// Fatal failures are for cases where we can't create a context at all or
-// something, making the use of the GPU impossible.
-// Non-fatal failures are for cases where we could gather most info, but maybe
-// some is missing (e.g. unable to parse a version string or to detect the exact
-// model).
-enum CollectInfoResult {
-  kCollectInfoFatalFailure,
-  kCollectInfoNonFatalFailure,
-  kCollectInfoSuccess
-};
-
 // Collect GPU vendor_id and device ID.
-GPU_EXPORT GpuIDResult CollectGpuID(uint32* vendor_id, uint32* device_id);
+GPU_EXPORT CollectInfoResult CollectGpuID(uint32* vendor_id, uint32* device_id);
 
 // Collects basic GPU info without creating a GL/DirectX context (and without
 // the danger of crashing), including vendor_id and device_id.
@@ -64,15 +46,6 @@ GPU_EXPORT void MergeGPUInfo(GPUInfo* basic_gpu_info,
 GPU_EXPORT void MergeGPUInfoGL(GPUInfo* basic_gpu_info,
                                const GPUInfo& context_gpu_info);
 
-// Advanced Micro Devices has interesting configurations on laptops were
-// there are two videocards that can alternatively a given process output.
-enum AMDVideoCardType {
-  UNKNOWN,
-  STANDALONE,
-  INTEGRATED,
-  SWITCHABLE
-};
-
 }  // namespace gpu
 
 #endif  // GPU_CONFIG_GPU_INFO_COLLECTOR_H_