Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
802bbe87
Commit
802bbe87
authored
Apr 10, 2020
by
PouleyKetchoupp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix extra warnings in Android build
parent
74d43211
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
9 deletions
+17
-9
.travis.yml
.travis.yml
+1
-1
SCsub
drivers/vulkan/SCsub
+8
-0
vulkan_context_android.cpp
platform/android/vulkan/vulkan_context_android.cpp
+0
-8
vk_mem_alloc.cpp
thirdparty/vulkan/android/vk_mem_alloc.cpp
+8
-0
No files found.
.travis.yml
View file @
802bbe87
...
...
@@ -57,7 +57,7 @@ matrix:
-
name
:
Android export template (release_debug, Clang)
stage
:
build
env
:
PLATFORM=android TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="werror=yes"
env
:
PLATFORM=android TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="w
arnings=extra w
error=yes"
os
:
linux
compiler
:
clang
addons
:
...
...
drivers/vulkan/SCsub
View file @
802bbe87
...
...
@@ -14,6 +14,14 @@ if env["platform"] == "android":
thirdparty_dir
+
"/layers/generated"
,
]
env
.
Prepend
(
CPPPATH
=
thirdparty_includes
)
# Build Vulkan memory allocator
env_thirdparty
=
env
.
Clone
()
env_thirdparty
.
disable_warnings
()
thirdparty_dir
=
"#thirdparty/vulkan"
vma_sources
=
[
thirdparty_dir
+
"/android/vk_mem_alloc.cpp"
]
env_thirdparty
.
add_source_files
(
env
.
drivers_sources
,
vma_sources
)
elif
env
[
"builtin_vulkan"
]:
# Use bundled Vulkan headers
thirdparty_dir
=
"#thirdparty/vulkan"
...
...
platform/android/vulkan/vulkan_context_android.cpp
View file @
802bbe87
...
...
@@ -31,14 +31,6 @@
#include "vulkan_context_android.h"
#include <vulkan/vulkan_android.h>
#define VMA_IMPLEMENTATION
#ifdef DEBUG_ENABLED
#ifndef _DEBUG
#define _DEBUG
#endif
#endif
#include <vk_mem_alloc.h>
const
char
*
VulkanContextAndroid
::
_get_platform_surface_extension
()
const
{
return
VK_KHR_ANDROID_SURFACE_EXTENSION_NAME
;
}
...
...
thirdparty/vulkan/android/vk_mem_alloc.cpp
0 → 100644
View file @
802bbe87
#define VMA_IMPLEMENTATION
#ifdef DEBUG_ENABLED
#ifndef _DEBUG
#define _DEBUG
#endif
#endif
// Include memory allocator from Android NDK
#include <vk_mem_alloc.h>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment