[Bf-blender-cvs] [41748b6a5ee] blender2.8: Cleanup: remove modules that were only used by the game engine.
Brecht Van Lommel
noreply at git.blender.org
Tue Apr 17 18:37:50 CEST 2018
Commit: 41748b6a5ee51979aa4ece022724d3a5fcf2651c
Author: Brecht Van Lommel
Date: Tue Apr 17 18:35:22 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB41748b6a5ee51979aa4ece022724d3a5fcf2651c
Cleanup: remove modules that were only used by the game engine.
===================================================================
M intern/CMakeLists.txt
D intern/container/CMakeLists.txt
D intern/container/CTR_HashedPtr.h
D intern/container/CTR_Map.h
D intern/gpudirect/CMakeLists.txt
D intern/gpudirect/dvpapi.cpp
D intern/gpudirect/dvpapi.h
===================================================================
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt
index 582ef480cd2..1a050892836 100644
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@ -77,10 +77,8 @@ if(WITH_OPENSUBDIV)
endif()
# only windows needs utf16 converter
-# gpudirect is a runtime interface to the nVidia's DVP driver, only for windows
if(WIN32)
add_subdirectory(utfconv)
- add_subdirectory(gpudirect)
endif()
if(WITH_OPENVDB)
diff --git a/intern/container/CMakeLists.txt b/intern/container/CMakeLists.txt
deleted file mode 100644
index 4743247af26..00000000000
--- a/intern/container/CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-# ***** 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) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(INC
- .
- ../guardedalloc
-)
-
-set(INC_SYS
-
-)
-
-set(SRC
- CTR_HashedPtr.h
- CTR_Map.h
-)
-
-# infact nothing to compile!
-blender_add_lib(bf_intern_ctr "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/container/CTR_HashedPtr.h b/intern/container/CTR_HashedPtr.h
deleted file mode 100644
index ee832eee153..00000000000
--- a/intern/container/CTR_HashedPtr.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * ***** 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) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- *
- */
-
-/** \file container/CTR_HashedPtr.h
- * \ingroup ctr
- */
-
-#ifndef __CTR_HASHEDPTR_H__
-#define __CTR_HASHEDPTR_H__
-
-#include <stdlib.h>
-
-inline unsigned int CTR_Hash(void *inDWord)
-{
- size_t key = (size_t)inDWord;
- return (unsigned int)(key ^ (key >> 4));
-}
-
-class CTR_HashedPtr
-{
- void *m_valptr;
-public:
- CTR_HashedPtr(void *val) : m_valptr(val) {
- }
- unsigned int hash() const {
- return CTR_Hash(m_valptr);
- }
- inline friend bool operator ==(const CTR_HashedPtr & rhs, const CTR_HashedPtr & lhs) {
- return rhs.m_valptr == lhs.m_valptr;
- }
- void *getValue() const {
- return m_valptr;
- }
-};
-
-#endif /* __CTR_HASHEDPTR_H__ */
-
diff --git a/intern/container/CTR_Map.h b/intern/container/CTR_Map.h
deleted file mode 100644
index c278fe5330c..00000000000
--- a/intern/container/CTR_Map.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * ***** 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) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file container/CTR_Map.h
- * \ingroup ctr
- */
-
-#ifndef __CTR_MAP_H__
-#define __CTR_MAP_H__
-
-template <class Key, class Value>
-class CTR_Map {
-private:
- struct Entry {
- Entry (Entry *next, Key key, Value value) :
- m_next(next),
- m_key(key),
- m_value(value) {
- }
-
- Entry *m_next;
- Key m_key;
- Value m_value;
- };
-
-public:
- CTR_Map(int num_buckets = 100) : m_num_buckets(num_buckets) {
- m_buckets = new Entry *[num_buckets];
- for (int i = 0; i < num_buckets; ++i) {
- m_buckets[i] = 0;
- }
- }
-
- CTR_Map(const CTR_Map& map)
- {
- m_num_buckets = map.m_num_buckets;
- m_buckets = new Entry *[m_num_buckets];
-
- for (int i = 0; i < m_num_buckets; ++i) {
- m_buckets[i] = 0;
-
- for (Entry *entry = map.m_buckets[i]; entry; entry = entry->m_next) {
- insert(entry->m_key, entry->m_value);
- }
- }
- }
-
- int size()
- {
- int count = 0;
- for (int i = 0; i < m_num_buckets; i++) {
- Entry *bucket = m_buckets[i];
- while (bucket) {
- bucket = bucket->m_next;
- count++;
- }
- }
- return count;
- }
-
- Value *at(int index)
- {
- int count = 0;
- for (int i = 0; i < m_num_buckets; i++) {
- Entry *bucket = m_buckets[i];
- while (bucket) {
- if (count == index) {
- return &bucket->m_value;
- }
- bucket = bucket->m_next;
- count++;
- }
- }
- return 0;
- }
-
- Key *getKey(int index)
- {
- int count = 0;
- for (int i = 0; i < m_num_buckets; i++) {
- Entry *bucket = m_buckets[i];
- while (bucket) {
- if (count == index) {
- return &bucket->m_key;
- }
- bucket = bucket->m_next;
- count++;
- }
- }
- return 0;
- }
-
- void clear()
- {
- for (int i = 0; i < m_num_buckets; ++i) {
- Entry *entry_ptr = m_buckets[i];
-
- while (entry_ptr != 0) {
- Entry *tmp_ptr = entry_ptr->m_next;
- delete entry_ptr;
- entry_ptr = tmp_ptr;
- }
- m_buckets[i] = 0;
- }
- }
-
- ~CTR_Map()
- {
- clear();
- delete[] m_buckets;
- }
-
- void insert(const Key& key, const Value& value)
- {
- Entry *entry_ptr = m_buckets[key.hash() % m_num_buckets];
- while ((entry_ptr != 0) && !(key == entry_ptr->m_key)) {
- entry_ptr = entry_ptr->m_next;
- }
-
- if (entry_ptr != 0) {
- entry_ptr->m_value = value;
- }
- else {
- Entry **bucket = &m_buckets[key.hash() % m_num_buckets];
- *bucket = new Entry(*bucket, key, value);
- }
- }
-
- void remove(const Key& key)
- {
- Entry **entry_ptr = &m_buckets[key.hash() % m_num_buckets];
- while ((*entry_ptr != 0) && !(key == (*entry_ptr)->m_key)) {
- entry_ptr = &(*entry_ptr)->m_next;
- }
-
- if (*entry_ptr != 0) {
- Entry *tmp_ptr = (*entry_ptr)->m_next;
- delete *entry_ptr;
- *entry_ptr = tmp_ptr;
- }
- }
-
- Value *operator[](Key key)
- {
- Entry *bucket = m_buckets[key.hash() % m_num_buckets];
- while ((bucket != 0) && !(key == bucket->m_key)) {
- bucket = bucket->m_next;
- }
- return bucket != 0 ? &bucket->m_value : 0;
- }
-
-private:
- int m_num_buckets;
- Entry **m_buckets;
-};
-
-#endif /* __CTR_MAP_H__ */
diff --git a/intern/gpudirect/CMakeLists.txt b/intern/gpudirect/CMakeLists.txt
deleted file mode 100644
index 88c09a663b8..00000000000
--- a/intern/gpudirect/CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-# ***** 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) 2015, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Blender Foundation.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(INC
- .
- # XXX, bad level include!
- ../../source/blender/blenlib
-)
-
-set(INC_SYS
- ${GLEW_INCLUDE_PATH}
-)
-
-set(SRC
- dvpapi.cpp
- dvpapi.h
-)
-
-blender_add_lib(bf_intern_gpudirect "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/intern/gpudirect/dvpapi.cpp b/intern/gpudirect/dvpapi.cpp
deleted file mode 100644
index 56b58e0a348..00000000000
--- a/intern/gpudirect/dvpapi.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * ***** 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, Fi
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list