Enable WebGL2 in web export, start fixing build

Will not yet compile
This commit is contained in:
eska
2017-01-31 03:46:30 +01:00
parent 7b059965e8
commit e06edc67c0
13 changed files with 40 additions and 62 deletions

View File

@ -33,6 +33,7 @@
#ifdef NO_THREADS
#define OBJTYPE_RLOCK
#define OBJTYPE_WLOCK
#else
@ -776,11 +777,15 @@ void ClassDB::add_property(StringName p_class,const PropertyInfo& p_pinfo, const
#ifndef NO_THREADS
lock->read_lock();
#endif
ClassInfo *type=classes.getptr(p_class);
#ifndef NO_THREADS
lock->read_unlock();
#endif
ERR_FAIL_COND(!type);

View File

@ -44,6 +44,14 @@ uint32_t atomic_conditional_increment( register uint32_t * pw ) {
return *pw;
}
uint32_t atomic_increment( register uint32_t * pw ) {
(*pw)++;
return *pw;
}
uint32_t atomic_decrement( register uint32_t * pw ) {
(*pw)--;

View File

@ -81,7 +81,7 @@ class Vector {
size_t p;
if (_mul_overflow(p_elements, sizeof(T), &o)) return false;
*out = nearest_power_of_2(o);
if (_add_overflow(o, 32, &p)) return false; //no longer allocated here
if (_add_overflow(o, static_cast<size_t>(32), &p)) return false; //no longer allocated here
return true;
#else
// Speed is more important than correctness here, do the operations unchecked