On Mon, Aug 05 2019, Thomas Frohwein <[email protected]> wrote:
> On Mon, Aug 05, 2019 at 12:05:05PM +0200, Jeremie Courreges-Anglas wrote:
> [...]
>> Here's a diff with proper comments which I deem desirable. Charlene,
>> Thomas, others: ok?
>
> I'd like to combine this with the update to the latest release (3.1.1)
> as previously proposed [1]. This update also does away with the
> thirdparty module that included nvcore.h, so that patch isn't needed
> anymore.
>
> The combined diff is below. I did a build and runtime test on amd64
> and didn't notice any issues.
>
> ok for combined diff?
I tend to prefer separating fixes and updates because it makes cvs log
clearer. Please do whatever you prefer, but I'm not volunteering to test
godot updates.
Your diff includes this hunk, which I find weird (.orig filename).
> Index: patches/patch-servers_visual_shader_language_cpp.orig
> ===================================================================
> RCS file: patches/patch-servers_visual_shader_language_cpp.orig
> diff -N patches/patch-servers_visual_shader_language_cpp.orig
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-servers_visual_shader_language_cpp.orig 5 Aug 2019
> 16:56:19 -0000
> @@ -0,0 +1,22 @@
> +$OpenBSD$
> +
> +Fix error with ports-gcc:
> + error: converting to 'bool' from 'std::nullptr_t' requires
> direct-initialization [-fpermissive]
> +
> +Index: servers/visual/shader_language.cpp
> +--- servers/visual/shader_language.cpp.orig
> ++++ servers/visual/shader_language.cpp
> +@@ -1869,11 +1869,11 @@ const ShaderLanguage::BuiltinFuncDef
> ShaderLanguage::b
> +
> + bool ShaderLanguage::_validate_function_call(BlockNode *p_block,
> OperatorNode *p_func, DataType *r_ret_type) {
> +
> +- ERR_FAIL_COND_V(p_func->op != OP_CALL && p_func->op != OP_CONSTRUCT,
> NULL);
> ++ ERR_FAIL_COND_V(p_func->op != OP_CALL && p_func->op != OP_CONSTRUCT,
> false);
> +
> + Vector<DataType> args;
> +
> +- ERR_FAIL_COND_V(p_func->arguments[0]->type != Node::TYPE_VARIABLE,
> NULL);
> ++ ERR_FAIL_COND_V(p_func->arguments[0]->type != Node::TYPE_VARIABLE,
> false);
> +
> + StringName name = static_cast<VariableNode
> *>(p_func->arguments[0])->name.operator String();
> +
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
