diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-13 15:53:32 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-14 10:02:31 +0100 |
| commit | d2537407efffde15372962ffca864b7400ade345 (patch) | |
| tree | 4d99ff9f4814abc3e531a447794a62139ece1178 /modules | |
| parent | 3679d49f4b709fd56e872633ead73008bc3e1c43 (diff) | |
Fix various GCC compilation warnings after Vulkan merge
Part of #36132.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/assimp/import_utils.h | 4 | ||||
| -rw-r--r-- | modules/basis_universal/SCsub | 6 | ||||
| -rw-r--r-- | modules/gdnative/arvr/arvr_interface_gdnative.cpp | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/modules/assimp/import_utils.h b/modules/assimp/import_utils.h index 0eb055956b..d037efce21 100644 --- a/modules/assimp/import_utils.h +++ b/modules/assimp/import_utils.h @@ -320,10 +320,10 @@ public: static void set_texture_mapping_mode(aiTextureMapMode *map_mode, Ref<ImageTexture> texture) { ERR_FAIL_COND(texture.is_null()); ERR_FAIL_COND(map_mode == NULL); - aiTextureMapMode tex_mode = map_mode[0]; - // FIXME: Commented out during Vulkan port. /* + aiTextureMapMode tex_mode = map_mode[0]; + int32_t flags = Texture2D::FLAGS_DEFAULT; if (tex_mode == aiTextureMapMode_Wrap) { //Default diff --git a/modules/basis_universal/SCsub b/modules/basis_universal/SCsub index 3e179762a5..d7342358d7 100644 --- a/modules/basis_universal/SCsub +++ b/modules/basis_universal/SCsub @@ -28,7 +28,11 @@ tool_sources = [ tool_sources = [thirdparty_dir + file for file in tool_sources] transcoder_sources = [thirdparty_dir + "transcoder/basisu_transcoder.cpp"] -env_basisu.Append(CPPPATH=[thirdparty_dir, thirdparty_dir + "transcoder"]) +# Treat Basis headers as system headers to avoid raising warnings. Not supported on MSVC. +if not env.msvc: + env_basisu.Append(CPPFLAGS=['-isystem', Dir(thirdparty_dir).path, '-isystem', Dir(thirdparty_dir + "transcoder").path]) +else: + env_basisu.Prepend(CPPPATH=[thirdparty_dir, thirdparty_dir + "transcoder"]) if env['target'] == "debug": env_basisu.Append(CPPFLAGS=["-DBASISU_DEVEL_MESSAGES=1", "-DBASISD_ENABLE_DEBUG_FLAGS=1"]) diff --git a/modules/gdnative/arvr/arvr_interface_gdnative.cpp b/modules/gdnative/arvr/arvr_interface_gdnative.cpp index 7c791a3108..a033c2b7f9 100644 --- a/modules/gdnative/arvr/arvr_interface_gdnative.cpp +++ b/modules/gdnative/arvr/arvr_interface_gdnative.cpp @@ -277,7 +277,9 @@ godot_transform GDAPI godot_arvr_get_reference_frame() { void GDAPI godot_arvr_blit(godot_int p_eye, godot_rid *p_render_target, godot_rect2 *p_rect) { // blits out our texture as is, handy for preview display of one of the eyes that is already rendered with lens distortion on an external HMD ARVRInterface::Eyes eye = (ARVRInterface::Eyes)p_eye; +#if 0 RID *render_target = (RID *)p_render_target; +#endif Rect2 screen_rect = *(Rect2 *)p_rect; if (eye == ARVRInterface::EYE_LEFT) { @@ -297,9 +299,12 @@ void GDAPI godot_arvr_blit(godot_int p_eye, godot_rid *p_render_target, godot_re godot_int GDAPI godot_arvr_get_texid(godot_rid *p_render_target) { // In order to send off our textures to display on our hardware we need the opengl texture ID instead of the render target RID // This is a handy function to expose that. +#if 0 RID *render_target = (RID *)p_render_target; RID eye_texture = VSG::storage->render_target_get_texture(*render_target); +#endif + #ifndef _MSC_VER #warning need to obtain this ID again #endif |