diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-05-22 01:25:30 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-05-22 01:25:30 +0300 |
| commit | 23035cf46fb4dd6a0bf7e688b0f15128030c77d1 (patch) | |
| tree | 0bb6a50e84ff6a15e0ca53d8ed0f6cc555f36169 /intern/gawain/src/element.c | |
| parent | 054eb9422ca5bfea460229374cd8986d297f74c8 (diff) | |
Gawain: remove GLenum from IndexType API
Goal is to make most of the API independent of OpenGL, Vulkan, any other backend.
Able to remove default case from ElementList_size because IndexType only covers index types. Not that and *everything else* like GLenum.
Diffstat (limited to 'intern/gawain/src/element.c')
| -rw-r--r-- | intern/gawain/src/element.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/intern/gawain/src/element.c b/intern/gawain/src/element.c index f27f3a6c43a..1346be024e3 100644 --- a/intern/gawain/src/element.c +++ b/intern/gawain/src/element.c @@ -15,6 +15,16 @@ #define KEEP_SINGLE_COPY 1 +static GLenum convert_index_type_to_gl(IndexType type) + { + static const GLenum table[] = { + [INDEX_U8] = GL_UNSIGNED_BYTE, // GL has this, Vulkan does not + [INDEX_U16] = GL_UNSIGNED_SHORT, + [INDEX_U32] = GL_UNSIGNED_INT + }; + return table[type]; + } + unsigned ElementList_size(const ElementList* elem) { #if TRACK_INDEX_RANGE @@ -23,11 +33,6 @@ unsigned ElementList_size(const ElementList* elem) case INDEX_U8: return elem->index_ct * sizeof(GLubyte); case INDEX_U16: return elem->index_ct * sizeof(GLushort); case INDEX_U32: return elem->index_ct * sizeof(GLuint); - default: - #if TRUST_NO_ONE - assert(false); - #endif - return 0; } #else @@ -252,6 +257,8 @@ void ElementList_build_in_place(ElementListBuilder* builder, ElementList* elem) elem->data = builder->data; } + + elem->gl_index_type = convert_index_type_to_gl(elem->index_type); #else if (builder->index_ct < builder->max_index_ct) { |