diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2018-07-17 15:46:44 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2018-07-18 01:17:57 +0300 |
commit | 6329629bb9eab86a989367a148154a7ebfa074df (patch) | |
tree | aafb933f0abe67c4ed24ade0c4675a1b63aa4c18 /intern/gawain/src/gwn_buffer_id.cpp | |
parent | a28fd8fee2f7d0f953b0c3603edfa18669b6c5fe (diff) |
GWN: Port to GPU module: codestyle & licence
Diffstat (limited to 'intern/gawain/src/gwn_buffer_id.cpp')
-rw-r--r-- | intern/gawain/src/gwn_buffer_id.cpp | 71 |
1 files changed, 45 insertions, 26 deletions
diff --git a/intern/gawain/src/gwn_buffer_id.cpp b/intern/gawain/src/gwn_buffer_id.cpp index 13473f1f28d..2c267682f65 100644 --- a/intern/gawain/src/gwn_buffer_id.cpp +++ b/intern/gawain/src/gwn_buffer_id.cpp @@ -1,13 +1,33 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * The Original Code is Copyright (C) 2016 by Mike Erwin. + * All rights reserved. + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ -// Gawain buffer IDs -// -// This code is part of the Gawain library, with modifications -// specific to integration with Blender. -// -// Copyright 2016 Mike Erwin -// -// This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of -// the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.#include "buffer_id.h" +/** \file blender/gpu/intern/gwn_buffer_id.cpp + * \ingroup gpu + * + * Gawain buffer IDs + */ #include "gwn_buffer_id.h" #include <mutex> @@ -24,47 +44,46 @@ static std::vector<GLuint> orphaned_buffer_ids; static std::mutex orphan_mutex; extern "C" { -extern int BLI_thread_is_main(void); // Blender-specific function +extern int BLI_thread_is_main(void); /* Blender-specific function */ } static bool thread_is_main() - { - // "main" here means the GL context's thread +{ + /* "main" here means the GL context's thread */ return BLI_thread_is_main(); - } +} GLuint GWN_buf_id_alloc() - { - // delete orphaned IDs +{ + /* delete orphaned IDs */ orphan_mutex.lock(); - if (!orphaned_buffer_ids.empty()) - { - const auto orphaned_buffer_len = (unsigned)orphaned_buffer_ids.size(); + if (!orphaned_buffer_ids.empty()) { + const auto orphaned_buffer_len = (uint)orphaned_buffer_ids.size(); #if ORPHAN_DEBUG printf("deleting %u orphaned VBO%s\n", orphaned_buffer_len, orphaned_buffer_len == 1 ? "" : "s"); #endif glDeleteBuffers(orphaned_buffer_len, orphaned_buffer_ids.data()); orphaned_buffer_ids.clear(); - } + } orphan_mutex.unlock(); GLuint new_buffer_id = 0; glGenBuffers(1, &new_buffer_id); return new_buffer_id; - } +} void GWN_buf_id_free(GLuint buffer_id) - { - if (thread_is_main()) +{ + if (thread_is_main()) { glDeleteBuffers(1, &buffer_id); - else - { - // add this ID to the orphaned list + } + else { + /* add this ID to the orphaned list */ orphan_mutex.lock(); #if ORPHAN_DEBUG printf("orphaning VBO %u\n", buffer_id); #endif orphaned_buffer_ids.emplace_back(buffer_id); orphan_mutex.unlock(); - } } +} |