diff options
| -rw-r--r-- | content/common/gpu/image_transport_surface_linux.cc (renamed from content/common/gpu/image_transport_surface_x11.cc) | 2 | ||||
| -rw-r--r-- | content/content_common.gypi | 2 | ||||
| -rw-r--r-- | gpu/config/gpu_info_collector_ozone.cc | 37 | ||||
| -rw-r--r-- | gpu/gpu_config.gypi | 1 |
4 files changed, 40 insertions, 2 deletions
diff --git a/content/common/gpu/image_transport_surface_x11.cc b/content/common/gpu/image_transport_surface_linux.cc index b6aca42..f8f95db 100644 --- a/content/common/gpu/image_transport_surface_x11.cc +++ b/content/common/gpu/image_transport_surface_linux.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/content/content_common.gypi b/content/content_common.gypi index adcb64c..c92c076 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -235,9 +235,9 @@ 'common/gpu/image_transport_surface.h', 'common/gpu/image_transport_surface.cc', 'common/gpu/image_transport_surface_android.cc', + 'common/gpu/image_transport_surface_linux.cc', 'common/gpu/image_transport_surface_mac.cc', 'common/gpu/image_transport_surface_win.cc', - 'common/gpu/image_transport_surface_x11.cc', 'common/gpu/media/h264_bit_reader.cc', 'common/gpu/media/h264_bit_reader.h', 'common/gpu/media/h264_parser.cc', diff --git a/gpu/config/gpu_info_collector_ozone.cc b/gpu/config/gpu_info_collector_ozone.cc new file mode 100644 index 0000000..acef6ae --- /dev/null +++ b/gpu/config/gpu_info_collector_ozone.cc @@ -0,0 +1,37 @@ +// Copyright 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "gpu/config/gpu_info_collector.h" + +#include "base/logging.h" + +namespace gpu { + +bool CollectContextGraphicsInfo(GPUInfo* gpu_info) { + return CollectBasicGraphicsInfo(gpu_info); +} + +GpuIDResult CollectGpuID(uint32* vendor_id, uint32* device_id) { + DCHECK(vendor_id && device_id); + *vendor_id = 0; + *device_id = 0; + return kGpuIDNotSupported; +} + +bool CollectBasicGraphicsInfo(GPUInfo* gpu_info) { + gpu_info->can_lose_context = false; + return true; +} + +bool CollectDriverInfoGL(GPUInfo* gpu_info) { + NOTIMPLEMENTED(); + return false; +} + +void MergeGPUInfo(GPUInfo* basic_gpu_info, + const GPUInfo& context_gpu_info) { + MergeGPUInfoGL(basic_gpu_info, context_gpu_info); +} + +} // namespace gpu_info_collector diff --git a/gpu/gpu_config.gypi b/gpu/gpu_config.gypi index 7ea4b56..c95605b 100644 --- a/gpu/gpu_config.gypi +++ b/gpu/gpu_config.gypi @@ -29,6 +29,7 @@ 'config/gpu_info.h', 'config/gpu_info_collector_android.cc', 'config/gpu_info_collector_mac.mm', + 'config/gpu_info_collector_ozone.cc', 'config/gpu_info_collector_win.cc', 'config/gpu_info_collector_x11.cc', 'config/gpu_info_collector.cc', |