Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: chromecast/port/gpu/config/gpu_info_collector_cast.cc

Issue 223143003: Initial checkin of chromecast content embedder (cast_shell) and related build scripts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add an additional function in gl_surface_cast.cc Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromecast/port/gpu/config/gpu_info_collector_cast.cc
diff --git a/gpu/config/gpu_info_collector_ozone.cc b/chromecast/port/gpu/config/gpu_info_collector_cast.cc
similarity index 72%
copy from gpu/config/gpu_info_collector_ozone.cc
copy to chromecast/port/gpu/config/gpu_info_collector_cast.cc
index 41bc21a9b76e91d0365977c7114b5e0653822e83..ea09b28436e1617f6f651f5de07cadae503c39da 100644
--- a/gpu/config/gpu_info_collector_ozone.cc
+++ b/chromecast/port/gpu/config/gpu_info_collector_cast.cc
@@ -1,17 +1,16 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright (c) 2014 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.
+/*
+ * This file is copied from gpu_info_collector_android.cc
+ */
#include "gpu/config/gpu_info_collector.h"
#include "base/logging.h"
namespace gpu {
-CollectInfoResult CollectContextGraphicsInfo(GPUInfo* gpu_info) {
- return CollectBasicGraphicsInfo(gpu_info);
-}
-
GpuIDResult CollectGpuID(uint32* vendor_id, uint32* device_id) {
DCHECK(vendor_id && device_id);
*vendor_id = 0;
@@ -20,13 +19,19 @@ GpuIDResult CollectGpuID(uint32* vendor_id, uint32* device_id) {
}
CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
+ // can_lose_context must be false to enable accelerated Canvas2D
gpu_info->can_lose_context = false;
+ gpu_info->finalized = true;
return kCollectInfoSuccess;
}
+CollectInfoResult CollectContextGraphicsInfo(GPUInfo* gpu_info) {
+ return CollectBasicGraphicsInfo(gpu_info);
+}
+
CollectInfoResult CollectDriverInfoGL(GPUInfo* gpu_info) {
- NOTIMPLEMENTED();
- return kCollectInfoNonFatalFailure;
+ gpu_info->software_rendering = true;
+ return kCollectInfoSuccess;
}
void MergeGPUInfo(GPUInfo* basic_gpu_info,
@@ -34,4 +39,4 @@ void MergeGPUInfo(GPUInfo* basic_gpu_info,
MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
}
-} // namespace gpu_info_collector
+} // namespace gpu

Powered by Google App Engine
This is Rietveld 408576698