AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Default GR_GL_FUNCTION_TYPE to __stdcall on Windows.

Browse Source 
Why is this configurable if we can't work without it?

Just to confirm, this is a Windows constraint, not an MSVC constraint, right?
Clang on Windows also needs __stdcall?

BUG=skia:5617
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2233883002

Review-Url: https://codereview.chromium.org/2233883002
This commit is contained in:
mtklein 2016-08-10 07:30:21 -07:00 committed by Commit bot
parent d1cfb5bebe
commit 3d96cb8db7
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gyp/common_conditions.gypi
View File

@ -66,7 +66,6 @@
{ {
'defines': [ 'defines': [
'_CRT_SECURE_NO_WARNINGS', '_CRT_SECURE_NO_WARNINGS',
'GR_GL_FUNCTION_TYPE=__stdcall',
'_HAS_EXCEPTIONS=0', '_HAS_EXCEPTIONS=0',
'WIN32_LEAN_AND_MEAN', 'WIN32_LEAN_AND_MEAN',
'NOMINMAX', 'NOMINMAX',

9
gyp/gpu.gyp
View File

@ -65,13 +65,6 @@
}], }],
], ],
'direct_dependent_settings': { 'direct_dependent_settings': {
'conditions': [
[ 'skia_os == "win"', {
'defines': [
'GR_GL_FUNCTION_TYPE=__stdcall',
],
}],
],
'include_dirs': [ 'include_dirs': [
'../include/gpu', '../include/gpu',
], ],
@ -251,7 +244,7 @@
# the gyp -> android.mk generator doesn't seem to like cpp files # the gyp -> android.mk generator doesn't seem to like cpp files
# in directories outside of src, bench, or dm. Until this gets fixed # in directories outside of src, bench, or dm. Until this gets fixed
# I just start the path in the src directory. # I just start the path in the src directory.
'<(skia_src_path)/../tools/viewer/sk_app/WindowContext.cpp', '<(skia_src_path)/../tools/viewer/sk_app/WindowContext.cpp',
'<(skia_src_path)/../tools/viewer/sk_app/VulkanWindowContext.cpp', '<(skia_src_path)/../tools/viewer/sk_app/VulkanWindowContext.cpp',
'<(skia_src_path)/../tools/viewer/sk_app/android/VulkanWindowContext_android.cpp' '<(skia_src_path)/../tools/viewer/sk_app/android/VulkanWindowContext_android.cpp'
], ],

6
include/gpu/gl/GrGLConfig.h
View File

@ -21,7 +21,11 @@
#endif #endif
#if !defined(GR_GL_FUNCTION_TYPE) #if !defined(GR_GL_FUNCTION_TYPE)
#define GR_GL_FUNCTION_TYPE #if defined(SK_BUILD_FOR_WIN32)
#define GR_GL_FUNCTION_TYPE __stdcall
#else
#define GR_GL_FUNCTION_TYPE
#endif
#endif #endif
/** /**