chrome/browser/android/vr_shell/vr_shell_renderer.h - Issue 2396663002: Reland gvr upgrade

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/android/vr_shell/vr_shell_renderer.h

Issue 2396663002: Reland gvr upgrade (Closed)

Patch Set: Created 4 years, 2 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 unified diff | Download patch

« build/config/features.gni ('K') | « chrome/browser/android/vr_shell/vr_shell.cc ('k') | device/vr/android/gvr/gvr_device.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_RENDERER_H_	5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_RENDERER_H_

6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_RENDERER_H_	6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_RENDERER_H_

7	7

8 #include <memory>	8 #include <memory>

9 #include <string>	9 #include <string>

10 #include <vector>	10 #include <vector>

11	11

12 #include "base/macros.h"	12 #include "base/macros.h"

13 #include "chrome/browser/android/vr_shell/vr_math.h"	13 #include "chrome/browser/android/vr_shell/vr_math.h"

14 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/g vr.h"	14 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr.h"

15 #include "third_party/gvr-android-sdk/src/ndk-beta/include/vr/gvr/capi/include/g vr_types.h"	15 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_ty pes.h"

16 #include "ui/gl/gl_bindings.h"	16 #include "ui/gl/gl_bindings.h"

17	17

18 namespace vr_shell {	18 namespace vr_shell {

19	19

20 typedef unsigned int GLuint;	20 typedef unsigned int GLuint;

21	21

22 enum ShaderID {	22 enum ShaderID {

23 SHADER_UNRECOGNIZED = 0,	23 SHADER_UNRECOGNIZED = 0,

24 TEXTURE_QUAD_VERTEX_SHADER,	24 TEXTURE_QUAD_VERTEX_SHADER,

25 TEXTURE_QUAD_FRAGMENT_SHADER,	25 TEXTURE_QUAD_FRAGMENT_SHADER,

(...skipping 130 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
156 std::unique_ptr<WebVrRenderer> webvr_renderer_;	156 std::unique_ptr<WebVrRenderer> webvr_renderer_;

157 std::unique_ptr<ReticleRenderer> reticle_renderer_;	157 std::unique_ptr<ReticleRenderer> reticle_renderer_;

158 std::unique_ptr<LaserRenderer> laser_renderer_;	158 std::unique_ptr<LaserRenderer> laser_renderer_;

159	159

160 DISALLOW_COPY_AND_ASSIGN(VrShellRenderer);	160 DISALLOW_COPY_AND_ASSIGN(VrShellRenderer);

161 };	161 };

162	162

163 } // namespace vr_shell	163 } // namespace vr_shell

164	164

165 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_RENDERER_H_	165 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_RENDERER_H_

OLD	NEW