kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix : Build error with uchar in intern_gawain.

Browse Source 
error introduced by  D3483, intern_gawain has no access to bli_systypes.h
This commit is contained in:
Ray Molenkamp 2018-06-16 21:49:11 -06:00
parent 45591cc0df
commit 0a08c5cd36
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
intern/gawain/gawain/gwn_vertex_buffer.h
View File

@ -34,7 +34,7 @@ typedef struct Gwn_VertBuf {
unsigned vertex_ct; // number of verts we want to draw unsigned vertex_ct; // number of verts we want to draw
unsigned vertex_alloc; // number of verts data unsigned vertex_alloc; // number of verts data
bool dirty; bool dirty;
uchar* data; // NULL indicates data in VRAM (unmapped) unsigned char* data; // NULL indicates data in VRAM (unmapped)
uint32_t vbo_id; // 0 indicates not yet allocated uint32_t vbo_id; // 0 indicates not yet allocated
Gwn_UsageType usage; // usage hint for GL optimisation Gwn_UsageType usage; // usage hint for GL optimisation
} Gwn_VertBuf; } Gwn_VertBuf;
@ -71,17 +71,17 @@ void GWN_vertbuf_attr_fill_stride(Gwn_VertBuf*, unsigned a_idx, unsigned stride,
typedef struct Gwn_VertBufRaw { typedef struct Gwn_VertBufRaw {
unsigned size; unsigned size;
unsigned stride; unsigned stride;
uchar* data; unsigned char* data;
uchar* data_init; unsigned char* data_init;
#if TRUST_NO_ONE #if TRUST_NO_ONE
// Only for overflow check // Only for overflow check
uchar* _data_end; unsigned char* _data_end;
#endif #endif
} Gwn_VertBufRaw; } Gwn_VertBufRaw;
GWN_INLINE void *GWN_vertbuf_raw_step(Gwn_VertBufRaw *a) GWN_INLINE void *GWN_vertbuf_raw_step(Gwn_VertBufRaw *a)
{ {
uchar* data = a->data; unsigned char* data = a->data;
a->data += a->stride; a->data += a->stride;
#if TRUST_NO_ONE #if TRUST_NO_ONE
assert(data < a->_data_end); assert(data < a->_data_end);