twix/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-12-25 10:22:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

WARNING: Issues on web building

Browse Source 
Found some issues when building for web using latest emscripten 1.38.30, traced the error and found that eglGetProcAdress does not return function pointers for VAO functionality, supported by extension.

It requires more investigation but now it works (avoiding VAO usage)
This commit is contained in:
Ray
2019-04-23 18:10:38 +02:00
parent 3aafa9d5ba
commit 0c567cd259
7 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile
View File

@ -42,7 +42,7 @@
.PHONY: all clean install uninstall
# Define required raylib variables
RAYLIB_VERSION = 2.4.0
RAYLIB_VERSION = 2.5.0
RAYLIB_API_VERSION = 2
# See below for alternatives.

3
src/core.c
View File

@ -3172,7 +3172,8 @@ static void PollInputEvents(void)
// NOTE: GLFW3 joystick functionality not available in web
#if defined(PLATFORM_WEB)
// Get number of gamepads connected
int numGamepads = emscripten_get_num_gamepads();
int numGamepads = 0;
if (emscripten_sample_gamepad_data() == EMSCRIPTEN_RESULT_SUCCESS) numGamepads = emscripten_get_num_gamepads();
for (int i = 0; (i < numGamepads) && (i < MAX_GAMEPADS); i++)
{

4
src/external/cgltf.h vendored
View File

@ -369,7 +369,7 @@ typedef struct cgltf_light {
cgltf_float spot_outer_cone_angle;
} cgltf_light;
typedef struct cgltf_node {
struct cgltf_node {
char* name;
cgltf_node* parent;
cgltf_node** children;
@ -388,7 +388,7 @@ typedef struct cgltf_node {
cgltf_float rotation[4];
cgltf_float scale[3];
cgltf_float matrix[16];
} cgltf_node;
};
typedef struct cgltf_scene {
char* name;

2
src/external/miniaudio.h vendored
View File

@ -21915,8 +21915,6 @@ extern "C" {
#endif
EMSCRIPTEN_KEEPALIVE void ma_device_process_pcm_frames_capture__webaudio(ma_device* pDevice, int frameCount, float* pFrames)
{
ma_result result;
if (pDevice->type == ma_device_type_duplex) {
ma_device__handle_duplex_callback_capture(pDevice, (ma_uint32)frameCount, pFrames, &pDevice->webaudio.duplexRB);
} else {

12
src/rlgl.h
View File

@ -1559,7 +1559,19 @@ void rlglInit(int width, int height)
glBindVertexArray = (PFNGLBINDVERTEXARRAYOESPROC)eglGetProcAddress("glBindVertexArrayOES");
glDeleteVertexArrays = (PFNGLDELETEVERTEXARRAYSOESPROC)eglGetProcAddress("glDeleteVertexArraysOES");
//glIsVertexArray = (PFNGLISVERTEXARRAYOESPROC)eglGetProcAddress("glIsVertexArrayOES"); // NOTE: Fails in WebGL, omitted
if (glGenVertexArrays == NULL) printf("glGenVertexArrays is NULL.\n"); // WEB: ISSUE FOUND! ...but why?
if (glBindVertexArray == NULL) printf("glBindVertexArray is NULL.\n"); // WEB: ISSUE FOUND! ...but why?
}
// TODO: HACK REVIEW!
// For some reason on raylib 2.5, VAO usage breaks the build
// error seems related to function pointers but I can not get detailed info...
// Avoiding VAO usage is the only solution for now... :(
// Ref: https://emscripten.org/docs/porting/guidelines/function_pointer_issues.html
#if defined(PLATFORM_WEB)
vaoSupported = false;
#endif
// Check NPOT textures support
// NOTE: Only check on OpenGL ES, OpenGL 3.3 has NPOT textures full support as core feature