diff --git a/generators/graph/voxel_generator_graph.cpp b/generators/graph/voxel_generator_graph.cpp index c2ae5a58..c272eb56 100644 --- a/generators/graph/voxel_generator_graph.cpp +++ b/generators/graph/voxel_generator_graph.cpp @@ -1850,10 +1850,10 @@ float VoxelGeneratorGraph::debug_measure_microseconds_per_voxel( src_y.resize(cube_volume); src_z.resize(cube_volume); src_sdf.resize(cube_volume); - Span sx(src_x, 0, src_x.size()); - Span sy(src_y, 0, src_y.size()); - Span sz(src_z, 0, src_z.size()); - Span ssdf(src_sdf, 0, src_sdf.size()); + Span sx = to_span(src_x); + Span sy = to_span(src_y); + Span sz = to_span(src_z); + Span ssdf = to_span(src_sdf); const bool per_node_profiling = node_profiling_info != nullptr; runtime.prepare_state(cache.state, sx.size(), per_node_profiling); diff --git a/generators/graph/voxel_graph_runtime.cpp b/generators/graph/voxel_graph_runtime.cpp index 2662ba28..6557fa48 100644 --- a/generators/graph/voxel_graph_runtime.cpp +++ b/generators/graph/voxel_graph_runtime.cpp @@ -432,7 +432,7 @@ void VoxelGraphRuntime::generate_set(State &state, Span in_x, Span #endif #endif - Span buffers(state.buffers, 0, state.buffers.size()); + Span buffers = to_span(state.buffers); // Bind inputs if (_program.x_input_address != -1) { @@ -518,8 +518,8 @@ void VoxelGraphRuntime::analyze_range( ERR_FAIL_COND(state.ranges.size() != _program.buffer_count); #endif - Span ranges(state.ranges, 0, state.ranges.size()); - Span buffers(state.buffers, 0, state.buffers.size()); + Span ranges = to_span(state.ranges); + Span buffers = to_span(state.buffers); // Reset users count, as they might be decreased during the analysis for (auto it = _program.buffer_specs.cbegin(); it != _program.buffer_specs.cend(); ++it) { diff --git a/util/span.h b/util/span.h index 30762403..6edbc842 100644 --- a/util/span.h +++ b/util/span.h @@ -37,22 +37,6 @@ public: _size = p_other.size(); } - // TODO Remove this one, prefer to_span() specializations - inline Span(std::vector &vec, size_t p_begin, size_t p_end) { - ZN_ASSERT(p_end >= p_begin); - ZN_ASSERT(p_begin < vec.size()); - ZN_ASSERT(p_end <= vec.size()); // `<=` because p_end is typically `p_begin + size` - _ptr = &vec[p_begin]; - _size = p_end - p_begin; - } - - // TODO Remove this one, prefer to_span() specializations - template - inline Span(FixedArray &a) { - _ptr = a.data(); - _size = a.size(); - } - inline Span sub(size_t from, size_t len) const { ZN_ASSERT(from + len <= _size); return Span(_ptr + from, len);