Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2017-05-26 18:23:23 +0300
committerMike Erwin <significant.bit@gmail.com>2017-05-26 18:23:23 +0300
commit620516965b4943ab6c2b0e14e63ff725cf5d1611 (patch)
tree011bd39c7c404e53c3b7721536f372551176d6b7 /intern
parentcd8a8a3d1f2a058b54aab2d913ce92d26325384d (diff)
Gawain: move convert_prim_type_to_gl to private API
Diffstat (limited to 'intern')
-rw-r--r--intern/gawain/gawain/primitive.h2
-rw-r--r--intern/gawain/gawain/primitive_private.h14
-rw-r--r--intern/gawain/src/batch.c1
-rw-r--r--intern/gawain/src/immediate.c1
-rw-r--r--intern/gawain/src/primitive.c1
5 files changed, 17 insertions, 2 deletions
diff --git a/intern/gawain/gawain/primitive.h b/intern/gawain/gawain/primitive.h
index 9140e8a2478..25e02ab09dd 100644
--- a/intern/gawain/gawain/primitive.h
+++ b/intern/gawain/gawain/primitive.h
@@ -38,5 +38,3 @@ typedef enum {
PrimitiveClass prim_class_of_type(PrimitiveType);
bool prim_type_belongs_to_class(PrimitiveType, PrimitiveClass);
-
-GLenum convert_prim_type_to_gl(PrimitiveType);
diff --git a/intern/gawain/gawain/primitive_private.h b/intern/gawain/gawain/primitive_private.h
new file mode 100644
index 00000000000..e78433ef304
--- /dev/null
+++ b/intern/gawain/gawain/primitive_private.h
@@ -0,0 +1,14 @@
+
+// Gawain geometric primitives (private interface for use inside Gawain)
+//
+// This code is part of the Gawain library, with modifications
+// specific to integration with Blender.
+//
+// Copyright 2017 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/.
+
+#pragma once
+
+GLenum convert_prim_type_to_gl(PrimitiveType);
diff --git a/intern/gawain/src/batch.c b/intern/gawain/src/batch.c
index 33bb31cc3f7..86dca0a214e 100644
--- a/intern/gawain/src/batch.c
+++ b/intern/gawain/src/batch.c
@@ -11,6 +11,7 @@
#include "batch.h"
#include "buffer_id.h"
+#include "primitive_private.h"
#include <stdlib.h>
// necessary functions from matrix API
diff --git a/intern/gawain/src/immediate.c b/intern/gawain/src/immediate.c
index 8b6f0fdbff5..af9a48c2f4d 100644
--- a/intern/gawain/src/immediate.c
+++ b/intern/gawain/src/immediate.c
@@ -14,6 +14,7 @@
#include "attrib_binding.h"
#include "attrib_binding_private.h"
#include "vertex_format_private.h"
+#include "primitive_private.h"
#include <string.h>
// necessary functions from matrix API
diff --git a/intern/gawain/src/primitive.c b/intern/gawain/src/primitive.c
index 90b3686b17d..da32932c1e5 100644
--- a/intern/gawain/src/primitive.c
+++ b/intern/gawain/src/primitive.c
@@ -10,6 +10,7 @@
// the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/.
#include "primitive.h"
+#include "primitive_private.h"
PrimitiveClass prim_class_of_type(PrimitiveType prim_type)
{