godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8042 from eska014/webgl2

Browse Source 
Some WebGL 2 and build fixes/clean-up
This commit is contained in:
Rémi Verschelde 2017-03-18 10:50:04 +01:00 committed by GitHub
commit f3dbd9e792
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gles3/rasterizer_storage_gles3.cpp
View File

@ -6280,8 +6280,7 @@ void RasterizerStorageGLES3::initialize() {
shaders.cubemap_filter.init(); shaders.cubemap_filter.init();
shaders.particles.init(); shaders.particles.init();
#ifndef GLES_OVER_GL #ifdef GLES_OVER_GL
glEnable(_EXT_TEXTURE_CUBE_MAP_SEAMLESS); glEnable(_EXT_TEXTURE_CUBE_MAP_SEAMLESS);
#endif #endif

29
platform/javascript/detect.py
View File

@ -28,7 +28,6 @@ def get_flags():
return [ return [
('tools', 'no'), ('tools', 'no'),
('module_etc1_enabled', 'no'), ('module_etc1_enabled', 'no'),
('module_mpc_enabled', 'no'),
('module_theora_enabled', 'no'), ('module_theora_enabled', 'no'),
] ]
@ -70,14 +69,16 @@ def configure(env):
env['LIBSUFFIX'] = '.bc' env['LIBSUFFIX'] = '.bc'
if (env["target"] == "release"): if (env["target"] == "release"):
env.Append(CCFLAGS=['-O2']) env.Append(CCFLAGS=['-O3'])
env.Append(LINKFLAGS=['-O3'])
elif (env["target"] == "release_debug"): elif (env["target"] == "release_debug"):
env.Append(CCFLAGS=['-O2', '-DDEBUG_ENABLED']) env.Append(CCFLAGS=['-O2', '-DDEBUG_ENABLED'])
elif (env["target"] == "debug"): env.Append(LINKFLAGS=['-O2'])
#env.Append(CCFLAGS=['-D_DEBUG', '-Wall', '-O2', '-DDEBUG_ENABLED']) # retain function names at the cost of file size, for backtraces and profiling
env.Append(CCFLAGS=['-D_DEBUG', '-Wall', '-g3', '-DDEBUG_ENABLED'])
env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC'])
env.Append(LINKFLAGS=['--profiling-funcs']) env.Append(LINKFLAGS=['--profiling-funcs'])
elif (env["target"] == "debug"):
env.Append(CCFLAGS=['-O1', '-D_DEBUG', '-Wall', '-g', '-DDEBUG_ENABLED'])
env.Append(LINKFLAGS=['-O1', '-g'])
# TODO: Move that to opus module's config # TODO: Move that to opus module's config
if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"): if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
@ -85,16 +86,15 @@ def configure(env):
# These flags help keep the file size down # These flags help keep the file size down
env.Append(CPPFLAGS=["-fno-exceptions", '-DNO_SAFE_CAST', '-fno-rtti']) env.Append(CPPFLAGS=["-fno-exceptions", '-DNO_SAFE_CAST', '-fno-rtti'])
env.Append(CPPFLAGS=['-DJAVASCRIPT_ENABLED', '-DUNIX_ENABLED', '-DPTHREAD_NO_RENAME', '-DNO_FCNTL', '-DMPC_FIXED_POINT', '-DTYPED_METHOD_BIND', '-DNO_THREADS']) env.Append(CPPFLAGS=['-DJAVASCRIPT_ENABLED', '-DUNIX_ENABLED', '-DPTHREAD_NO_RENAME', '-DTYPED_METHOD_BIND', '-DNO_THREADS'])
env.Append(CPPFLAGS=['-DGLES3_ENABLED']) env.Append(CPPFLAGS=['-DGLES3_ENABLED'])
env.Append(LINKFLAGS=['-s', 'USE_WEBGL2=1'])
if env['wasm'] == 'yes': if (env['wasm'] == 'yes'):
env.Append(LINKFLAGS=['-s', 'BINARYEN=1']) env.Append(LINKFLAGS=['-s', 'BINARYEN=1'])
# Maximum memory size is baked into the WebAssembly binary during # In contrast to asm.js, enabling memory growth on WebAssembly has no
# compilation, so we need to enable memory growth to allow setting # major performance impact, and causes only a negligible increase in
# TOTAL_MEMORY at runtime. The value set at runtime must be higher than # memory size.
# what is set during compilation, check TOTAL_MEMORY in Emscripten's
# src/settings.js for the default.
env.Append(LINKFLAGS=['-s', 'ALLOW_MEMORY_GROWTH=1']) env.Append(LINKFLAGS=['-s', 'ALLOW_MEMORY_GROWTH=1'])
env.extra_suffix = '.webassembly' + env.extra_suffix env.extra_suffix = '.webassembly' + env.extra_suffix
else: else:
@ -104,8 +104,5 @@ def configure(env):
if env['javascript_eval'] == 'yes': if env['javascript_eval'] == 'yes':
env.Append(CPPFLAGS=['-DJAVASCRIPT_EVAL_ENABLED']) env.Append(CPPFLAGS=['-DJAVASCRIPT_EVAL_ENABLED'])
env.Append(LINKFLAGS=['-O2'])
env.Append(LINKFLAGS=['-s', 'USE_WEBGL2=1'])
# env.Append(LINKFLAGS=['-g4'])
import methods import methods