kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warning, Linux compile

Browse Source
This commit is contained in:
Joshua Granick
2016-10-04 13:54:44 -07:00
parent 8b5631ae77
commit a811952b16
2 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
project/src/audio/openal/OpenALBindings.cpp
View File

@@ -42,7 +42,7 @@ namespace lime {
void lime_al_buffer_data (value buffer, int format, value data, int size, int freq) { void lime_al_buffer_data (value buffer, int format, value data, int size, int freq) {
ALuint id = reinterpret_cast<ALuint> (val_data (buffer)); ALuint id = (ALuint)(uintptr_t)val_data (buffer);
ArrayBufferView bufferView (data); ArrayBufferView bufferView (data);
alBufferData (id, format, bufferView.Data (), size, freq); alBufferData (id, format, bufferView.Data (), size, freq);
@@ -51,7 +51,7 @@ namespace lime {
void lime_al_buffer3f (value buffer, int param, float value1, float value2, float value3) { void lime_al_buffer3f (value buffer, int param, float value1, float value2, float value3) {
ALuint id = reinterpret_cast<ALuint> (val_data (buffer)); ALuint id = (ALuint)(uintptr_t)val_data (buffer);
alBuffer3f (id, param, value1, value2, value3); alBuffer3f (id, param, value1, value2, value3);
} }
@@ -59,7 +59,7 @@ namespace lime {
void lime_al_buffer3i (value buffer, int param, int value1, int value2, int value3) { void lime_al_buffer3i (value buffer, int param, int value1, int value2, int value3) {
ALuint id = reinterpret_cast<ALuint> (val_data (buffer)); ALuint id = (ALuint)(uintptr_t)val_data (buffer);
alBuffer3i (id, param, value1, value2, value3); alBuffer3i (id, param, value1, value2, value3);
} }
@@ -67,7 +67,7 @@ namespace lime {
void lime_al_bufferf (value buffer, int param, float value) { void lime_al_bufferf (value buffer, int param, float value) {
ALuint id = reinterpret_cast<ALuint> (val_data (buffer)); ALuint id = (ALuint)(uintptr_t)val_data (buffer);
alBufferf (id, param, value); alBufferf (id, param, value);
} }
@@ -75,7 +75,7 @@ namespace lime {
void lime_al_bufferfv (value buffer, int param, value values) { void lime_al_bufferfv (value buffer, int param, value values) {
ALuint id = reinterpret_cast<ALuint> (val_data (buffer)); ALuint id = (ALuint)(uintptr_t)val_data (buffer);
if (val_is_null (values) == false) { if (val_is_null (values) == false) {
@@ -98,7 +98,7 @@ namespace lime {
void lime_al_bufferi (value buffer, int param, int value) { void lime_al_bufferi (value buffer, int param, int value) {
ALuint id = reinterpret_cast<ALuint> (val_data (buffer)); ALuint id = (ALuint)(uintptr_t)val_data (buffer);
alBufferi (id, param, value); alBufferi (id, param, value);
} }
@@ -106,7 +106,7 @@ namespace lime {
void lime_al_bufferiv (value buffer, int param, value values) { void lime_al_bufferiv (value buffer, int param, value values) {
ALuint id = reinterpret_cast<ALuint> (val_data (buffer)); ALuint id = (ALuint)(uintptr_t)val_data (buffer);
if (val_is_null (values) == false) { if (val_is_null (values) == false) {
@@ -153,7 +153,7 @@ namespace lime {
if (!val_is_null (buffer)) { if (!val_is_null (buffer)) {
ALuint data = reinterpret_cast<ALuint> (val_data (buffer)); ALuint data = (ALuint)(uintptr_t)val_data (buffer);
val_gc (buffer, 0); val_gc (buffer, 0);
alDeleteBuffers ((ALuint)1, &data); alDeleteBuffers ((ALuint)1, &data);
gc_al_pointers.erase (data); gc_al_pointers.erase (data);
@@ -174,7 +174,7 @@ namespace lime {
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
buffer = val_array_i (buffers, i); buffer = val_array_i (buffers, i);
data[i] = reinterpret_cast<ALuint> (val_data (buffer)); data[i] = (ALuint)(uintptr_t)val_data (buffer);
val_gc (buffer, 0); val_gc (buffer, 0);
gc_al_pointers.erase (data[i]); gc_al_pointers.erase (data[i]);
@@ -190,7 +190,7 @@ namespace lime {
void lime_al_delete_source (value source) { void lime_al_delete_source (value source) {
ALuint data = reinterpret_cast<ALuint> (val_data (source)); ALuint data = (ALuint)(uintptr_t)val_data (source);
alDeleteSources(1, &data); alDeleteSources(1, &data);
} }
@@ -207,7 +207,7 @@ namespace lime {
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
source = val_array_i (sources, i); source = val_array_i (sources, i);
data[i] = reinterpret_cast<ALuint> (val_data (source)); data[i] = (ALuint)(uintptr_t)val_data (source);
val_gc (source, 0); val_gc (source, 0);
} }
@@ -259,7 +259,7 @@ namespace lime {
ALuint buffer; ALuint buffer;
alGenBuffers ((ALuint)1, &buffer); alGenBuffers ((ALuint)1, &buffer);
value ptr = CFFIPointer ((void*)buffer, gc_al_buffer); value ptr = CFFIPointer ((void*)(uintptr_t)buffer, gc_al_buffer);
gc_al_pointers[buffer] = ptr; gc_al_pointers[buffer] = ptr;
return ptr; return ptr;
@@ -279,7 +279,7 @@ namespace lime {
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
buffer = buffers[i]; buffer = buffers[i];
ptr = CFFIPointer ((void*)buffer, gc_al_buffer); ptr = CFFIPointer ((void*)(uintptr_t)buffer, gc_al_buffer);
gc_al_pointers[buffer] = ptr; gc_al_pointers[buffer] = ptr;
val_array_set_i (result, i, ptr); val_array_set_i (result, i, ptr);
@@ -296,7 +296,7 @@ namespace lime {
ALuint source; ALuint source;
alGenSources ((ALuint)1, &source); alGenSources ((ALuint)1, &source);
return CFFIPointer ((void*)source, gc_al_source); return CFFIPointer ((void*)(uintptr_t)source, gc_al_source);
} }
@@ -310,7 +310,7 @@ namespace lime {
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
val_array_set_i (result, i, CFFIPointer ((void*)alloc_int (sources[i]), gc_al_source)); val_array_set_i (result, i, CFFIPointer ((void*)(uintptr_t)sources[i], gc_al_source));
} }
@@ -348,7 +348,7 @@ namespace lime {
value lime_al_get_buffer3f (value buffer, int param) { value lime_al_get_buffer3f (value buffer, int param) {
ALuint id = reinterpret_cast<ALuint> (val_data (buffer)); ALuint id = (ALuint)(uintptr_t)val_data (buffer);
ALfloat val1, val2, val3; ALfloat val1, val2, val3;
alGetBuffer3f (id, param, &val1, &val2, &val3); alGetBuffer3f (id, param, &val1, &val2, &val3);
@@ -364,7 +364,7 @@ namespace lime {
value lime_al_get_buffer3i (value buffer, int param) { value lime_al_get_buffer3i (value buffer, int param) {
ALuint id = reinterpret_cast<ALuint> (val_data (buffer)); ALuint id = (ALuint)(uintptr_t)val_data (buffer);
ALint val1, val2, val3; ALint val1, val2, val3;
alGetBuffer3i (id, param, &val1, &val2, &val3); alGetBuffer3i (id, param, &val1, &val2, &val3);
@@ -380,7 +380,7 @@ namespace lime {
float lime_al_get_bufferf (value buffer, int param) { float lime_al_get_bufferf (value buffer, int param) {
ALuint id = reinterpret_cast<ALuint> (val_data (buffer)); ALuint id = (ALuint)(uintptr_t)val_data (buffer);
ALfloat data; ALfloat data;
alGetBufferf (id, param, &data); alGetBufferf (id, param, &data);
return data; return data;
@@ -390,7 +390,7 @@ namespace lime {
value lime_al_get_bufferfv (value buffer, int param, int count) { value lime_al_get_bufferfv (value buffer, int param, int count) {
ALuint id = reinterpret_cast<ALuint> (val_data (buffer)); ALuint id = (ALuint)(uintptr_t)val_data (buffer);
ALfloat* values = new ALfloat[count]; ALfloat* values = new ALfloat[count];
alGetBufferfv (id, param, values); alGetBufferfv (id, param, values);
@@ -410,7 +410,7 @@ namespace lime {
int lime_al_get_bufferi (value buffer, int param) { int lime_al_get_bufferi (value buffer, int param) {
ALuint id = reinterpret_cast<ALuint> (val_data (buffer)); ALuint id = (ALuint)(uintptr_t)val_data (buffer);
ALint data; ALint data;
alGetBufferi (id, param, &data); alGetBufferi (id, param, &data);
return data; return data;
@@ -420,7 +420,7 @@ namespace lime {
value lime_al_get_bufferiv (value buffer, int param, int count) { value lime_al_get_bufferiv (value buffer, int param, int count) {
ALuint id = reinterpret_cast<ALuint> (val_data (buffer)); ALuint id = (ALuint)(uintptr_t)val_data (buffer);
ALint* values = new ALint[count]; ALint* values = new ALint[count];
alGetBufferiv (id, param, values); alGetBufferiv (id, param, values);
@@ -625,7 +625,7 @@ namespace lime {
value lime_al_get_source3f (value source, int param) { value lime_al_get_source3f (value source, int param) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
ALfloat val1, val2, val3; ALfloat val1, val2, val3;
alGetSource3f (id, param, &val1, &val2, &val3); alGetSource3f (id, param, &val1, &val2, &val3);
@@ -641,7 +641,7 @@ namespace lime {
value lime_al_get_source3i (value source, int param) { value lime_al_get_source3i (value source, int param) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
ALint val1, val2, val3; ALint val1, val2, val3;
alGetSource3i (id, param, &val1, &val2, &val3); alGetSource3i (id, param, &val1, &val2, &val3);
@@ -657,7 +657,7 @@ namespace lime {
float lime_al_get_sourcef (value source, int param) { float lime_al_get_sourcef (value source, int param) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
ALfloat data; ALfloat data;
alGetSourcef (id, param, &data); alGetSourcef (id, param, &data);
return data; return data;
@@ -667,7 +667,7 @@ namespace lime {
value lime_al_get_sourcefv (value source, int param, int count) { value lime_al_get_sourcefv (value source, int param, int count) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
ALfloat* values = new ALfloat[count]; ALfloat* values = new ALfloat[count];
alGetSourcefv (id, param, values); alGetSourcefv (id, param, values);
@@ -687,7 +687,7 @@ namespace lime {
value lime_al_get_sourcei (value source, int param) { value lime_al_get_sourcei (value source, int param) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
ALint data; ALint data;
alGetSourcei (id, param, &data); alGetSourcei (id, param, &data);
@@ -699,7 +699,7 @@ namespace lime {
} else { } else {
value ptr = CFFIPointer ((void*)data, gc_al_buffer); value ptr = CFFIPointer ((void*)(uintptr_t)data, gc_al_buffer);
gc_al_pointers[data] = ptr; gc_al_pointers[data] = ptr;
return ptr; return ptr;
@@ -716,7 +716,7 @@ namespace lime {
value lime_al_get_sourceiv (value source, int param, int count) { value lime_al_get_sourceiv (value source, int param, int count) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
ALint* values = new ALint[count]; ALint* values = new ALint[count];
alGetSourceiv (id, param, values); alGetSourceiv (id, param, values);
@@ -744,7 +744,7 @@ namespace lime {
bool lime_al_is_buffer (value buffer) { bool lime_al_is_buffer (value buffer) {
ALuint id = reinterpret_cast<ALuint> (val_data (buffer)); ALuint id = (ALuint)(uintptr_t)val_data (buffer);
return alIsBuffer (id); return alIsBuffer (id);
} }
@@ -766,7 +766,7 @@ namespace lime {
bool lime_al_is_source (value source) { bool lime_al_is_source (value source) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
return alIsSource (id); return alIsSource (id);
} }
@@ -844,7 +844,7 @@ namespace lime {
void lime_al_source_pause (value source) { void lime_al_source_pause (value source) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
alSourcePause (id); alSourcePause (id);
} }
@@ -859,7 +859,7 @@ namespace lime {
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
data[i] = reinterpret_cast<ALuint> (val_data (val_array_i (sources, i))); data[i] = (ALuint)(uintptr_t)val_data (val_array_i (sources, i));
} }
@@ -872,7 +872,7 @@ namespace lime {
void lime_al_source_play (value source) { void lime_al_source_play (value source) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
alSourcePlay (id); alSourcePlay (id);
} }
@@ -887,7 +887,7 @@ namespace lime {
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
data[i] = reinterpret_cast<ALuint> (val_data (val_array_i (sources, i))); data[i] = (ALuint)(uintptr_t)val_data (val_array_i (sources, i));
} }
@@ -901,7 +901,7 @@ namespace lime {
void lime_al_source_queue_buffers (value source, int nb, value buffers) { void lime_al_source_queue_buffers (value source, int nb, value buffers) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
if (val_is_null (buffers) == false) { if (val_is_null (buffers) == false) {
@@ -910,7 +910,7 @@ namespace lime {
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
data[i] = reinterpret_cast<ALuint> (val_data (val_array_i (buffers, i))); data[i] = (ALuint)(uintptr_t)val_data (val_array_i (buffers, i));
} }
@@ -924,7 +924,7 @@ namespace lime {
void lime_al_source_rewind (value source) { void lime_al_source_rewind (value source) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
alSourceRewind (id); alSourceRewind (id);
} }
@@ -939,7 +939,7 @@ namespace lime {
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
data[i] = reinterpret_cast<ALuint> (val_data (val_array_i (sources, i))); data[i] = (ALuint)(uintptr_t)val_data (val_array_i (sources, i));
} }
@@ -953,7 +953,7 @@ namespace lime {
void lime_al_source_stop (value source) { void lime_al_source_stop (value source) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
alSourceStop (id); alSourceStop (id);
} }
@@ -968,7 +968,7 @@ namespace lime {
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
data[i] = reinterpret_cast<ALuint> (val_data (val_array_i (sources, i))); data[i] = (ALuint)(uintptr_t)val_data (val_array_i (sources, i));
} }
@@ -982,7 +982,7 @@ namespace lime {
value lime_al_source_unqueue_buffers (value source, int nb) { value lime_al_source_unqueue_buffers (value source, int nb) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
ALuint* buffers = new ALuint[nb]; ALuint* buffers = new ALuint[nb];
alSourceUnqueueBuffers (id, nb, buffers); alSourceUnqueueBuffers (id, nb, buffers);
@@ -1000,7 +1000,7 @@ namespace lime {
} else { } else {
ptr = CFFIPointer ((void*)buffer, gc_al_buffer); ptr = CFFIPointer ((void*)(uintptr_t)buffer, gc_al_buffer);
gc_al_pointers[buffer] = ptr; gc_al_pointers[buffer] = ptr;
} }
@@ -1017,7 +1017,7 @@ namespace lime {
void lime_al_source3f (value source, int param, float value1, float value2, float value3) { void lime_al_source3f (value source, int param, float value1, float value2, float value3) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
alSource3f (id, param, value1, value2, value3); alSource3f (id, param, value1, value2, value3);
} }
@@ -1025,7 +1025,7 @@ namespace lime {
void lime_al_source3i (value source, int param, int value1, int value2, int value3) { void lime_al_source3i (value source, int param, int value1, int value2, int value3) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
alSource3i (id, param, value1, value2, value3); alSource3i (id, param, value1, value2, value3);
} }
@@ -1033,7 +1033,7 @@ namespace lime {
void lime_al_sourcef (value source, int param, float value) { void lime_al_sourcef (value source, int param, float value) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
alSourcef (id, param, value); alSourcef (id, param, value);
} }
@@ -1041,7 +1041,7 @@ namespace lime {
void lime_al_sourcefv (value source, int param, value values) { void lime_al_sourcefv (value source, int param, value values) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
if (val_is_null (values) == false) { if (val_is_null (values) == false) {
@@ -1064,12 +1064,12 @@ namespace lime {
void lime_al_sourcei (value source, int param, value val) { void lime_al_sourcei (value source, int param, value val) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
ALuint data; ALuint data;
if (param == AL_BUFFER) { if (param == AL_BUFFER) {
data = reinterpret_cast<ALuint> (val_data (val)); data = (ALuint)(uintptr_t)val_data (val);
} else { } else {
@@ -1084,7 +1084,7 @@ namespace lime {
void lime_al_sourceiv (value source, int param, value values) { void lime_al_sourceiv (value source, int param, value values) {
ALuint id = reinterpret_cast<ALuint> (val_data (source)); ALuint id = (ALuint)(uintptr_t)val_data (source);
if (val_is_null (values) == false) { if (val_is_null (values) == false) {
@@ -1093,7 +1093,7 @@ namespace lime {
for (int i = 0; i < size; ++i) { for (int i = 0; i < size; ++i) {
data[i] = (ALint)val_data (val_array_i (values, i)); data[i] = (ALint)val_int (val_array_i (values, i));
} }

14
project/src/graphics/opengl/OpenGLBindings.cpp
View File

@@ -422,7 +422,7 @@ namespace lime {
GLuint buffer; GLuint buffer;
glGenBuffers (1, &buffer); glGenBuffers (1, &buffer);
return CFFIPointer ((void*)buffer, gc_gl_buffer); return CFFIPointer ((void*)(uintptr_t)buffer, gc_gl_buffer);
} }
@@ -431,14 +431,14 @@ namespace lime {
GLuint id = 0; GLuint id = 0;
glGenFramebuffers (1, &id); glGenFramebuffers (1, &id);
return CFFIPointer ((void*)id, gc_gl_framebuffer); return CFFIPointer ((void*)(uintptr_t)id, gc_gl_framebuffer);
} }
value lime_gl_create_program () { value lime_gl_create_program () {
return CFFIPointer ((void*)glCreateProgram (), gc_gl_program); return CFFIPointer ((void*)(uintptr_t)glCreateProgram (), gc_gl_program);
} }
@@ -447,23 +447,23 @@ namespace lime {
GLuint id = 0; GLuint id = 0;
glGenRenderbuffers (1, &id); glGenRenderbuffers (1, &id);
return CFFIPointer ((void*)id, gc_gl_render_buffer); return CFFIPointer ((void*)(uintptr_t)id, gc_gl_render_buffer);
} }
value lime_gl_create_shader (int type) { value lime_gl_create_shader (int type) {
return CFFIPointer ((void*)glCreateShader (type), gc_gl_shader); return CFFIPointer ((void*)(uintptr_t)glCreateShader (type), gc_gl_shader);
} }
value lime_gl_create_texture () { value lime_gl_create_texture () {
unsigned int id = 0; GLuint id = 0;
glGenTextures (1, &id); glGenTextures (1, &id);
return CFFIPointer ((void*)id, gc_gl_texture); return CFFIPointer ((void*)(uintptr_t)id, gc_gl_texture);
} }