archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Gawain: simplify attrib binding API

Browse Source 
This API is used internally by the immediate and batch drawing systems.
This commit is contained in:
Mike Erwin
2016-09-15 12:57:07 +02:00
parent 2fb5a959e9
commit 0d54d32dd6
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/gpu/gawain/attrib_binding.c
View File

@@ -11,6 +11,10 @@
#include "attrib_binding.h"
#if MAX_VERTEX_ATTRIBS != 16
#error "attrib binding code assumes MAX_VERTEX_ATTRIBS = 16"
#endif
void clear_AttribBinding(AttribBinding* binding)
{
binding->loc_bits = 0;
@@ -20,7 +24,6 @@ void clear_AttribBinding(AttribBinding* binding)
unsigned read_attrib_location(const AttribBinding* binding, unsigned a_idx)
{
#if TRUST_NO_ONE
assert(MAX_VERTEX_ATTRIBS == 16);
assert(a_idx < MAX_VERTEX_ATTRIBS);
assert(binding->enabled_bits & (1 << a_idx));
#endif
@@ -28,10 +31,9 @@ unsigned read_attrib_location(const AttribBinding* binding, unsigned a_idx)
return (binding->loc_bits >> (4 * a_idx)) & 0xF;
}
void write_attrib_location(AttribBinding* binding, unsigned a_idx, unsigned location)
static void write_attrib_location(AttribBinding* binding, unsigned a_idx, unsigned location)
{
#if TRUST_NO_ONE
assert(MAX_VERTEX_ATTRIBS == 16);
assert(a_idx < MAX_VERTEX_ATTRIBS);
assert(location < MAX_VERTEX_ATTRIBS);
#endif
@@ -59,6 +61,7 @@ void get_attrib_locations(const VertexFormat* format, AttribBinding* binding, GL
#if TRUST_NO_ONE
assert(loc != -1);
// TODO: make this a recoverable runtime error? indicates mismatch between vertex format and program
#endif
write_attrib_location(binding, a_idx, loc);

4
source/blender/gpu/gawain/attrib_binding.h
View File

@@ -20,7 +20,5 @@ typedef struct {
void clear_AttribBinding(AttribBinding*);
unsigned read_attrib_location(const AttribBinding*, unsigned a_idx);
void write_attrib_location(AttribBinding*, unsigned a_idx, unsigned location);
void get_attrib_locations(const VertexFormat*, AttribBinding*, GLuint program);
unsigned read_attrib_location(const AttribBinding*, unsigned a_idx);