include/gpu/vk/GrVkDefines.h - Issue 1999213002: Add Xlib support to viewer

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: include/gpu/vk/GrVkDefines.h

Issue 1999213002: Add Xlib support to viewer (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Fix line lengths Created 4 years, 7 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

OLD	NEW
1	1

2 /*	2 /*

3 * Copyright 2016 Google Inc.	3 * Copyright 2016 Google Inc.

4 *	4 *

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

6 * found in the LICENSE file.	6 * found in the LICENSE file.

7 */	7 */

8	8

9 #ifndef GrVkDefines_DEFINED	9 #ifndef GrVkDefines_DEFINED

10 #define GrVkDefines_DEFINED	10 #define GrVkDefines_DEFINED

11	11

12 #if defined(SK_BUILD_FOR_WIN) \|\| defined(SK_BUILD_FOR_WIN32)	12 #if defined(SK_BUILD_FOR_WIN) \|\| defined(SK_BUILD_FOR_WIN32)

13 # define VK_USE_PLATFORM_WIN32_KHR	13 # define VK_USE_PLATFORM_WIN32_KHR

14 #elif defined(SK_BUILD_FOR_ANDROID)	14 #elif defined(SK_BUILD_FOR_ANDROID)

15 # define VK_USE_PLATFORM_ANDROID_KHR	15 # define VK_USE_PLATFORM_ANDROID_KHR

16 #elif defined(SK_BUILD_FOR_UNIX)	16 #elif defined(SK_BUILD_FOR_UNIX)

17 # define VK_USE_PLATFORM_XLIB_KHR	17 # define VK_USE_PLATFORM_XCB_KHR

18 #endif	18 #endif

19	19

20 #if defined(Bool) \|\| defined(Status) \|\| defined(True) \|\| defined(False)	20 #if defined(Bool) \|\| defined(Status) \|\| defined(True) \|\| defined(False)

21 # pragma error "Macros unexpectedly defined."	21 # pragma error "Macros unexpectedly defined."

22 #endif	22 #endif

23	23

24 #include <vulkan/vulkan.h>	24 #include <vulkan/vulkan.h>

25	25

26	26

27 // Xlib.h may define these macros with common names (Grrr)	27 // Xlib.h may define these macros with common names (Grrr)
bsalomon 2016/05/23 17:54:59 Maybe we can remove this stuff now? Maybe we can remove this stuff now? jvanverth1 2016/05/23 18:19:10 Done. Show quoted text On 2016/05/23 17:54:59, bsalomon wrote: > Maybe we can remove this stuff now? Done.
28 #ifdef Bool	28 #ifdef Bool

29 # undef Bool	29 # undef Bool

30 #endif	30 #endif

31 #ifdef Status	31 #ifdef Status

32 # undef Status	32 # undef Status

33 #endif	33 #endif

34 #ifdef True	34 #ifdef True

35 # undef True	35 # undef True

36 #endif	36 #endif

37 #ifdef False	37 #ifdef False

38 # undef False	38 # undef False

39 #endif	39 #endif

40	40

41 #endif	41 #endif

OLD	NEW

« no previous file with comments | « include/gpu/vk/GrVkBackendContext.h ('k') | src/gpu/vk/GrVkBackendContext.cpp » ('j') | tools/viewer/sk_app/unix/Window_unix.h » ('J')