Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
liujiuri
engine
提交
7e294c5f
E
engine
项目概览
liujiuri
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7e294c5f
编写于
11月 12, 2015
作者:
A
Adam Barth
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2045 from abarth/gpu_direct
Move GPU code into direct
上级
acdf951c
8a6ef543
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
22 addition
and
22 deletion
+22
-22
sky/shell/BUILD.gn
sky/shell/BUILD.gn
+6
-6
sky/shell/gpu/direct/ganesh_context.cc
sky/shell/gpu/direct/ganesh_context.cc
+1
-1
sky/shell/gpu/direct/ganesh_context.h
sky/shell/gpu/direct/ganesh_context.h
+3
-3
sky/shell/gpu/direct/ganesh_surface.cc
sky/shell/gpu/direct/ganesh_surface.cc
+1
-1
sky/shell/gpu/direct/ganesh_surface.h
sky/shell/gpu/direct/ganesh_surface.h
+4
-4
sky/shell/gpu/direct/rasterizer.cc
sky/shell/gpu/direct/rasterizer.cc
+3
-3
sky/shell/gpu/direct/rasterizer.h
sky/shell/gpu/direct/rasterizer.h
+3
-3
sky/shell/shell_view.cc
sky/shell/shell_view.cc
+1
-1
未找到文件。
sky/shell/BUILD.gn
浏览文件 @
7e294c5f
...
...
@@ -43,12 +43,12 @@ if (is_linux || is_mac) {
source_set("common") {
sources = [
"gpu/ganesh_context.cc",
"gpu/ganesh_context.h",
"gpu/ganesh_surface.cc",
"gpu/ganesh_surface.h",
"gpu/rasterizer.cc",
"gpu/rasterizer.h",
"gpu/
direct/
ganesh_context.cc",
"gpu/
direct/
ganesh_context.h",
"gpu/
direct/
ganesh_surface.cc",
"gpu/
direct/
ganesh_surface.h",
"gpu/
direct/
rasterizer.cc",
"gpu/
direct/
rasterizer.h",
"gpu_delegate.cc",
"gpu_delegate.h",
"platform_view.cc",
...
...
sky/shell/gpu/ganesh_context.cc
→
sky/shell/gpu/
direct/
ganesh_context.cc
浏览文件 @
7e294c5f
...
...
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "sky/shell/gpu/ganesh_context.h"
#include "sky/shell/gpu/
direct/
ganesh_context.h"
#include "base/logging.h"
#include "third_party/skia/include/gpu/gl/GrGLInterface.h"
...
...
sky/shell/gpu/ganesh_context.h
→
sky/shell/gpu/
direct/
ganesh_context.h
浏览文件 @
7e294c5f
...
...
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef SKY_SHELL_GPU_GANESH_CONTEXT_H_
#define SKY_SHELL_GPU_GANESH_CONTEXT_H_
#ifndef SKY_SHELL_GPU_
DIRECT_
GANESH_CONTEXT_H_
#define SKY_SHELL_GPU_
DIRECT_
GANESH_CONTEXT_H_
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
...
...
@@ -34,4 +34,4 @@ class GaneshContext {
}
// namespace shell
}
// namespace sky
#endif // SKY_SHELL_GPU_GANESH_CONTEXT_H_
#endif // SKY_SHELL_GPU_
DIRECT_
GANESH_CONTEXT_H_
sky/shell/gpu/ganesh_surface.cc
→
sky/shell/gpu/
direct/
ganesh_surface.cc
浏览文件 @
7e294c5f
...
...
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "sky/shell/gpu/ganesh_surface.h"
#include "sky/shell/gpu/
direct/
ganesh_surface.h"
#include "base/logging.h"
#include "third_party/skia/include/gpu/GrContext.h"
...
...
sky/shell/gpu/ganesh_surface.h
→
sky/shell/gpu/
direct/
ganesh_surface.h
浏览文件 @
7e294c5f
...
...
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef SKY_SHELL_GPU_GANESH_SURFACE_H_
#define SKY_SHELL_GPU_GANESH_SURFACE_H_
#ifndef SKY_SHELL_GPU_
DIRECT_
GANESH_SURFACE_H_
#define SKY_SHELL_GPU_
DIRECT_
GANESH_SURFACE_H_
#include "base/memory/scoped_ptr.h"
#include "sky/engine/wtf/RefPtr.h"
#include "sky/shell/gpu/ganesh_context.h"
#include "sky/shell/gpu/
direct/
ganesh_context.h"
#include "third_party/skia/include/core/SkSurface.h"
#include "ui/gfx/geometry/size.h"
...
...
@@ -38,4 +38,4 @@ class GaneshSurface {
}
// namespace shell
}
// namespace sky
#endif // SKY_SHELL_GPU_GANESH_SURFACE_H_
#endif // SKY_SHELL_GPU_
DIRECT_
GANESH_SURFACE_H_
sky/shell/gpu/rasterizer.cc
→
sky/shell/gpu/
direct/
rasterizer.cc
浏览文件 @
7e294c5f
...
...
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "sky/shell/gpu/rasterizer.h"
#include "sky/shell/gpu/
direct/
rasterizer.h"
#include "base/trace_event/trace_event.h"
#include "sky/compositor/container_layer.h"
#include "sky/compositor/layer.h"
#include "sky/compositor/paint_context.h"
#include "sky/compositor/picture_layer.h"
#include "sky/shell/gpu/ganesh_context.h"
#include "sky/shell/gpu/ganesh_surface.h"
#include "sky/shell/gpu/
direct/
ganesh_context.h"
#include "sky/shell/gpu/
direct/
ganesh_surface.h"
#include "sky/shell/shell.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkPicture.h"
...
...
sky/shell/gpu/rasterizer.h
→
sky/shell/gpu/
direct/
rasterizer.h
浏览文件 @
7e294c5f
...
...
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef SKY_SHELL_GPU_RASTERIZER_H_
#define SKY_SHELL_GPU_RASTERIZER_H_
#ifndef SKY_SHELL_GPU_
DIRECT_
RASTERIZER_H_
#define SKY_SHELL_GPU_
DIRECT_
RASTERIZER_H_
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
...
...
@@ -58,4 +58,4 @@ class Rasterizer : public GPUDelegate {
}
// namespace shell
}
// namespace sky
#endif // SKY_SHELL_GPU_RASTERIZER_H_
#endif // SKY_SHELL_GPU_
DIRECT_
RASTERIZER_H_
sky/shell/shell_view.cc
浏览文件 @
7e294c5f
...
...
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/single_thread_task_runner.h"
#include "sky/shell/gpu/rasterizer.h"
#include "sky/shell/gpu/
direct/
rasterizer.h"
#include "sky/shell/platform_view.h"
#include "sky/shell/shell.h"
#include "sky/shell/ui/engine.h"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录