diff --git a/examples/runtime/shaders/glsl/fs_bump.bin b/examples/runtime/shaders/glsl/fs_bump.bin index 6bce30eca..053fa60f2 100644 Binary files a/examples/runtime/shaders/glsl/fs_bump.bin and b/examples/runtime/shaders/glsl/fs_bump.bin differ diff --git a/examples/runtime/shaders/glsl/fs_callback.bin b/examples/runtime/shaders/glsl/fs_callback.bin index 3fc056761..cd33eb568 100644 Binary files a/examples/runtime/shaders/glsl/fs_callback.bin and b/examples/runtime/shaders/glsl/fs_callback.bin differ diff --git a/examples/runtime/shaders/glsl/fs_cubes.bin b/examples/runtime/shaders/glsl/fs_cubes.bin index f05e6f27e..693031755 100644 Binary files a/examples/runtime/shaders/glsl/fs_cubes.bin and b/examples/runtime/shaders/glsl/fs_cubes.bin differ diff --git a/examples/runtime/shaders/glsl/fs_hdr_blur.bin b/examples/runtime/shaders/glsl/fs_hdr_blur.bin index 731640205..150c06b64 100644 Binary files a/examples/runtime/shaders/glsl/fs_hdr_blur.bin and b/examples/runtime/shaders/glsl/fs_hdr_blur.bin differ diff --git a/examples/runtime/shaders/glsl/fs_hdr_bright.bin b/examples/runtime/shaders/glsl/fs_hdr_bright.bin index 4c003c87f..eff7591b5 100644 Binary files a/examples/runtime/shaders/glsl/fs_hdr_bright.bin and b/examples/runtime/shaders/glsl/fs_hdr_bright.bin differ diff --git a/examples/runtime/shaders/glsl/fs_hdr_lum.bin b/examples/runtime/shaders/glsl/fs_hdr_lum.bin index ec6734a0b..e1545ed11 100644 Binary files a/examples/runtime/shaders/glsl/fs_hdr_lum.bin and b/examples/runtime/shaders/glsl/fs_hdr_lum.bin differ diff --git a/examples/runtime/shaders/glsl/fs_hdr_lumavg.bin b/examples/runtime/shaders/glsl/fs_hdr_lumavg.bin index 58a8bcd33..13de50fa0 100644 Binary files a/examples/runtime/shaders/glsl/fs_hdr_lumavg.bin and b/examples/runtime/shaders/glsl/fs_hdr_lumavg.bin differ diff --git a/examples/runtime/shaders/glsl/fs_hdr_mesh.bin b/examples/runtime/shaders/glsl/fs_hdr_mesh.bin index 73025c9ae..c7752bb39 100644 Binary files a/examples/runtime/shaders/glsl/fs_hdr_mesh.bin and b/examples/runtime/shaders/glsl/fs_hdr_mesh.bin differ diff --git a/examples/runtime/shaders/glsl/fs_hdr_skybox.bin b/examples/runtime/shaders/glsl/fs_hdr_skybox.bin index bce60058f..ccb565589 100644 Binary files a/examples/runtime/shaders/glsl/fs_hdr_skybox.bin and b/examples/runtime/shaders/glsl/fs_hdr_skybox.bin differ diff --git a/examples/runtime/shaders/glsl/fs_hdr_tonemap.bin b/examples/runtime/shaders/glsl/fs_hdr_tonemap.bin index 857d2fc99..2fb13f5ac 100644 Binary files a/examples/runtime/shaders/glsl/fs_hdr_tonemap.bin and b/examples/runtime/shaders/glsl/fs_hdr_tonemap.bin differ diff --git a/examples/runtime/shaders/glsl/fs_instancing.bin b/examples/runtime/shaders/glsl/fs_instancing.bin index f05e6f27e..693031755 100644 Binary files a/examples/runtime/shaders/glsl/fs_instancing.bin and b/examples/runtime/shaders/glsl/fs_instancing.bin differ diff --git a/examples/runtime/shaders/glsl/fs_mesh.bin b/examples/runtime/shaders/glsl/fs_mesh.bin index 9ff6afbba..f66aa293a 100644 Binary files a/examples/runtime/shaders/glsl/fs_mesh.bin and b/examples/runtime/shaders/glsl/fs_mesh.bin differ diff --git a/examples/runtime/shaders/glsl/fs_raymarching.bin b/examples/runtime/shaders/glsl/fs_raymarching.bin index 80d504382..c1fefd0e3 100644 --- a/examples/runtime/shaders/glsl/fs_raymarching.bin +++ b/examples/runtime/shaders/glsl/fs_raymarching.bin @@ -1,6 +1,4 @@ -FSHƒòá#version 120 - -uniform vec3 u_lightDir; +FSHƒòáuniform vec3 u_lightDir; uniform mat4 u_mtx; varying vec2 v_texcoord0; varying vec4 v_color0; diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_color_lightning.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_color_lightning.bin index 54a30724e..51b225765 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_color_lightning.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_color_lightning.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_color_texture.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_color_texture.bin index 439cd0acd..6eb00aced 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_color_texture.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_color_texture.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svbackblank.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svbackblank.bin index 69f3bc7fa..b30b617a4 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_svbackblank.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_svbackblank.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svbackcolor.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svbackcolor.bin index aeac0a8ff..111977a20 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_svbackcolor.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_svbackcolor.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svbacktex1.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svbacktex1.bin index 8676decfb..64a9fd9ea 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_svbacktex1.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_svbacktex1.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svbacktex2.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svbacktex2.bin index 956b55566..227aec935 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_svbacktex2.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_svbacktex2.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontblank.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontblank.bin index c984c5311..2a84c9598 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontblank.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontblank.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontcolor.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontcolor.bin index aeac0a8ff..111977a20 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontcolor.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_svfrontcolor.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svfronttex1.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svfronttex1.bin index 5a980a0a4..a46c596c9 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_svfronttex1.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_svfronttex1.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svfronttex2.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svfronttex2.bin index dac853d63..7c2dc8b1c 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_svfronttex2.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_svfronttex2.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svside.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svside.bin index c4a581a4b..64bab921e 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_svside.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_svside.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svsideblank.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svsideblank.bin index 7889bad24..dbc718321 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_svsideblank.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_svsideblank.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svsidecolor.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svsidecolor.bin index 5ac4def8f..d7b63d322 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_svsidecolor.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_svsidecolor.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_svsidetex.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_svsidetex.bin index b23f20867..96fad0d23 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_svsidetex.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_svsidetex.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_texture.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_texture.bin index acd39cb91..3ea416c80 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_texture.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_texture.bin differ diff --git a/examples/runtime/shaders/glsl/fs_shadowvolume_texture_lightning.bin b/examples/runtime/shaders/glsl/fs_shadowvolume_texture_lightning.bin index 02216c3da..3a688f1e0 100644 Binary files a/examples/runtime/shaders/glsl/fs_shadowvolume_texture_lightning.bin and b/examples/runtime/shaders/glsl/fs_shadowvolume_texture_lightning.bin differ diff --git a/examples/runtime/shaders/glsl/fs_stencil_color_black.bin b/examples/runtime/shaders/glsl/fs_stencil_color_black.bin index a23bab00d..d66f79aaf 100644 Binary files a/examples/runtime/shaders/glsl/fs_stencil_color_black.bin and b/examples/runtime/shaders/glsl/fs_stencil_color_black.bin differ diff --git a/examples/runtime/shaders/glsl/fs_stencil_color_lightning.bin b/examples/runtime/shaders/glsl/fs_stencil_color_lightning.bin index bbdde141c..e3b75388d 100644 Binary files a/examples/runtime/shaders/glsl/fs_stencil_color_lightning.bin and b/examples/runtime/shaders/glsl/fs_stencil_color_lightning.bin differ diff --git a/examples/runtime/shaders/glsl/fs_stencil_color_texture.bin b/examples/runtime/shaders/glsl/fs_stencil_color_texture.bin index 439cd0acd..6eb00aced 100644 Binary files a/examples/runtime/shaders/glsl/fs_stencil_color_texture.bin and b/examples/runtime/shaders/glsl/fs_stencil_color_texture.bin differ diff --git a/examples/runtime/shaders/glsl/fs_stencil_texture.bin b/examples/runtime/shaders/glsl/fs_stencil_texture.bin index acd39cb91..3ea416c80 100644 Binary files a/examples/runtime/shaders/glsl/fs_stencil_texture.bin and b/examples/runtime/shaders/glsl/fs_stencil_texture.bin differ diff --git a/examples/runtime/shaders/glsl/fs_stencil_texture_lightning.bin b/examples/runtime/shaders/glsl/fs_stencil_texture_lightning.bin index bfedaff47..f681aa55f 100644 Binary files a/examples/runtime/shaders/glsl/fs_stencil_texture_lightning.bin and b/examples/runtime/shaders/glsl/fs_stencil_texture_lightning.bin differ diff --git a/examples/runtime/shaders/glsl/fs_tree.bin b/examples/runtime/shaders/glsl/fs_tree.bin index ed502b2da..5dd43cb23 100644 Binary files a/examples/runtime/shaders/glsl/fs_tree.bin and b/examples/runtime/shaders/glsl/fs_tree.bin differ diff --git a/examples/runtime/shaders/glsl/fs_update.bin b/examples/runtime/shaders/glsl/fs_update.bin index a3158b1a6..40844d125 100644 Binary files a/examples/runtime/shaders/glsl/fs_update.bin and b/examples/runtime/shaders/glsl/fs_update.bin differ diff --git a/examples/runtime/shaders/glsl/fs_update_cmp.bin b/examples/runtime/shaders/glsl/fs_update_cmp.bin index f2bc53f9a..391304c05 100644 Binary files a/examples/runtime/shaders/glsl/fs_update_cmp.bin and b/examples/runtime/shaders/glsl/fs_update_cmp.bin differ diff --git a/examples/runtime/shaders/glsl/vs_bump.bin b/examples/runtime/shaders/glsl/vs_bump.bin index 280a64fb7..2c6679972 100644 Binary files a/examples/runtime/shaders/glsl/vs_bump.bin and b/examples/runtime/shaders/glsl/vs_bump.bin differ diff --git a/examples/runtime/shaders/glsl/vs_bump_instanced.bin b/examples/runtime/shaders/glsl/vs_bump_instanced.bin index 92ce52295..8ad62fde7 100644 Binary files a/examples/runtime/shaders/glsl/vs_bump_instanced.bin and b/examples/runtime/shaders/glsl/vs_bump_instanced.bin differ diff --git a/examples/runtime/shaders/glsl/vs_callback.bin b/examples/runtime/shaders/glsl/vs_callback.bin index d6c318d85..c1722ec33 100644 Binary files a/examples/runtime/shaders/glsl/vs_callback.bin and b/examples/runtime/shaders/glsl/vs_callback.bin differ diff --git a/examples/runtime/shaders/glsl/vs_cubes.bin b/examples/runtime/shaders/glsl/vs_cubes.bin index d8aa23f14..e226f13c4 100644 Binary files a/examples/runtime/shaders/glsl/vs_cubes.bin and b/examples/runtime/shaders/glsl/vs_cubes.bin differ diff --git a/examples/runtime/shaders/glsl/vs_hdr_blur.bin b/examples/runtime/shaders/glsl/vs_hdr_blur.bin index 9032d136f..3d6338c50 100644 Binary files a/examples/runtime/shaders/glsl/vs_hdr_blur.bin and b/examples/runtime/shaders/glsl/vs_hdr_blur.bin differ diff --git a/examples/runtime/shaders/glsl/vs_hdr_bright.bin b/examples/runtime/shaders/glsl/vs_hdr_bright.bin index 2fb9ea820..82cd38130 100644 Binary files a/examples/runtime/shaders/glsl/vs_hdr_bright.bin and b/examples/runtime/shaders/glsl/vs_hdr_bright.bin differ diff --git a/examples/runtime/shaders/glsl/vs_hdr_lum.bin b/examples/runtime/shaders/glsl/vs_hdr_lum.bin index 2fb9ea820..82cd38130 100644 Binary files a/examples/runtime/shaders/glsl/vs_hdr_lum.bin and b/examples/runtime/shaders/glsl/vs_hdr_lum.bin differ diff --git a/examples/runtime/shaders/glsl/vs_hdr_lumavg.bin b/examples/runtime/shaders/glsl/vs_hdr_lumavg.bin index 2fb9ea820..82cd38130 100644 Binary files a/examples/runtime/shaders/glsl/vs_hdr_lumavg.bin and b/examples/runtime/shaders/glsl/vs_hdr_lumavg.bin differ diff --git a/examples/runtime/shaders/glsl/vs_hdr_mesh.bin b/examples/runtime/shaders/glsl/vs_hdr_mesh.bin index b97b55422..f1c7bdc2e 100644 Binary files a/examples/runtime/shaders/glsl/vs_hdr_mesh.bin and b/examples/runtime/shaders/glsl/vs_hdr_mesh.bin differ diff --git a/examples/runtime/shaders/glsl/vs_hdr_skybox.bin b/examples/runtime/shaders/glsl/vs_hdr_skybox.bin index 2fb9ea820..82cd38130 100644 Binary files a/examples/runtime/shaders/glsl/vs_hdr_skybox.bin and b/examples/runtime/shaders/glsl/vs_hdr_skybox.bin differ diff --git a/examples/runtime/shaders/glsl/vs_hdr_tonemap.bin b/examples/runtime/shaders/glsl/vs_hdr_tonemap.bin index 38ac17b14..36c120a0a 100644 Binary files a/examples/runtime/shaders/glsl/vs_hdr_tonemap.bin and b/examples/runtime/shaders/glsl/vs_hdr_tonemap.bin differ diff --git a/examples/runtime/shaders/glsl/vs_instancing.bin b/examples/runtime/shaders/glsl/vs_instancing.bin index 801425440..27636041c 100644 Binary files a/examples/runtime/shaders/glsl/vs_instancing.bin and b/examples/runtime/shaders/glsl/vs_instancing.bin differ diff --git a/examples/runtime/shaders/glsl/vs_mesh.bin b/examples/runtime/shaders/glsl/vs_mesh.bin index d11bbb6d3..cf336ac46 100644 Binary files a/examples/runtime/shaders/glsl/vs_mesh.bin and b/examples/runtime/shaders/glsl/vs_mesh.bin differ diff --git a/examples/runtime/shaders/glsl/vs_raymarching.bin b/examples/runtime/shaders/glsl/vs_raymarching.bin index bc9dda430..a5954dd09 100644 Binary files a/examples/runtime/shaders/glsl/vs_raymarching.bin and b/examples/runtime/shaders/glsl/vs_raymarching.bin differ diff --git a/examples/runtime/shaders/glsl/vs_shadowvolume_color_lightning.bin b/examples/runtime/shaders/glsl/vs_shadowvolume_color_lightning.bin index 63b36c26d..ef1e42a99 100644 Binary files a/examples/runtime/shaders/glsl/vs_shadowvolume_color_lightning.bin and b/examples/runtime/shaders/glsl/vs_shadowvolume_color_lightning.bin differ diff --git a/examples/runtime/shaders/glsl/vs_shadowvolume_color_texture.bin b/examples/runtime/shaders/glsl/vs_shadowvolume_color_texture.bin index 2fb9ea820..82cd38130 100644 Binary files a/examples/runtime/shaders/glsl/vs_shadowvolume_color_texture.bin and b/examples/runtime/shaders/glsl/vs_shadowvolume_color_texture.bin differ diff --git a/examples/runtime/shaders/glsl/vs_shadowvolume_svback.bin b/examples/runtime/shaders/glsl/vs_shadowvolume_svback.bin index 716e32af2..4f920aeea 100644 Binary files a/examples/runtime/shaders/glsl/vs_shadowvolume_svback.bin and b/examples/runtime/shaders/glsl/vs_shadowvolume_svback.bin differ diff --git a/examples/runtime/shaders/glsl/vs_shadowvolume_svfront.bin b/examples/runtime/shaders/glsl/vs_shadowvolume_svfront.bin index 541aec895..c08b5667c 100644 Binary files a/examples/runtime/shaders/glsl/vs_shadowvolume_svfront.bin and b/examples/runtime/shaders/glsl/vs_shadowvolume_svfront.bin differ diff --git a/examples/runtime/shaders/glsl/vs_shadowvolume_svside.bin b/examples/runtime/shaders/glsl/vs_shadowvolume_svside.bin index 197ec792b..c73da93ca 100644 Binary files a/examples/runtime/shaders/glsl/vs_shadowvolume_svside.bin and b/examples/runtime/shaders/glsl/vs_shadowvolume_svside.bin differ diff --git a/examples/runtime/shaders/glsl/vs_shadowvolume_texture.bin b/examples/runtime/shaders/glsl/vs_shadowvolume_texture.bin index 2fb9ea820..82cd38130 100644 Binary files a/examples/runtime/shaders/glsl/vs_shadowvolume_texture.bin and b/examples/runtime/shaders/glsl/vs_shadowvolume_texture.bin differ diff --git a/examples/runtime/shaders/glsl/vs_shadowvolume_texture_lightning.bin b/examples/runtime/shaders/glsl/vs_shadowvolume_texture_lightning.bin index 3315c768b..edd0ff75d 100644 Binary files a/examples/runtime/shaders/glsl/vs_shadowvolume_texture_lightning.bin and b/examples/runtime/shaders/glsl/vs_shadowvolume_texture_lightning.bin differ diff --git a/examples/runtime/shaders/glsl/vs_stencil_color.bin b/examples/runtime/shaders/glsl/vs_stencil_color.bin index 541aec895..c08b5667c 100644 Binary files a/examples/runtime/shaders/glsl/vs_stencil_color.bin and b/examples/runtime/shaders/glsl/vs_stencil_color.bin differ diff --git a/examples/runtime/shaders/glsl/vs_stencil_color_lightning.bin b/examples/runtime/shaders/glsl/vs_stencil_color_lightning.bin index 2661e40b2..e16656f3f 100644 Binary files a/examples/runtime/shaders/glsl/vs_stencil_color_lightning.bin and b/examples/runtime/shaders/glsl/vs_stencil_color_lightning.bin differ diff --git a/examples/runtime/shaders/glsl/vs_stencil_color_texture.bin b/examples/runtime/shaders/glsl/vs_stencil_color_texture.bin index 2fb9ea820..82cd38130 100644 Binary files a/examples/runtime/shaders/glsl/vs_stencil_color_texture.bin and b/examples/runtime/shaders/glsl/vs_stencil_color_texture.bin differ diff --git a/examples/runtime/shaders/glsl/vs_stencil_texture.bin b/examples/runtime/shaders/glsl/vs_stencil_texture.bin index 2fb9ea820..82cd38130 100644 Binary files a/examples/runtime/shaders/glsl/vs_stencil_texture.bin and b/examples/runtime/shaders/glsl/vs_stencil_texture.bin differ diff --git a/examples/runtime/shaders/glsl/vs_stencil_texture_lightning.bin b/examples/runtime/shaders/glsl/vs_stencil_texture_lightning.bin index cb843e493..3d5205f36 100644 Binary files a/examples/runtime/shaders/glsl/vs_stencil_texture_lightning.bin and b/examples/runtime/shaders/glsl/vs_stencil_texture_lightning.bin differ diff --git a/examples/runtime/shaders/glsl/vs_tree.bin b/examples/runtime/shaders/glsl/vs_tree.bin index 6d9d19690..4de00d5dd 100644 Binary files a/examples/runtime/shaders/glsl/vs_tree.bin and b/examples/runtime/shaders/glsl/vs_tree.bin differ diff --git a/examples/runtime/shaders/glsl/vs_update.bin b/examples/runtime/shaders/glsl/vs_update.bin index 1e175a1ea..1190296a9 100644 Binary files a/examples/runtime/shaders/glsl/vs_update.bin and b/examples/runtime/shaders/glsl/vs_update.bin differ diff --git a/src/glimports.h b/src/glimports.h index d9d25ab75..9541af72b 100644 --- a/src/glimports.h +++ b/src/glimports.h @@ -15,7 +15,7 @@ // OpenGL 2.1 Reference Pages // http://www.opengl.org/sdk/docs/man/ -#if BX_PLATFORM_WINDOWS +#if BX_PLATFORM_WINDOWS || BGFX_CONFIG_RENDERER_OPENGL >= 31 GL_IMPORT____(false, PFNGLGETERRORPROC, glGetError); GL_IMPORT____(false, PFNGLREADPIXELSPROC, glReadPixels); GL_IMPORT____(false, PFNGLTEXIMAGE2DPROC, glTexImage2D); @@ -100,6 +100,7 @@ GL_IMPORT____(false, PFNGLGENRENDERBUFFERSPROC, glGenRenderbuff GL_IMPORT____(false, PFNGLDELETERENDERBUFFERSPROC, glDeleteRenderbuffers); GL_IMPORT____(false, PFNGLRENDERBUFFERSTORAGEPROC, glRenderbufferStorage); GL_IMPORT____(false, PFNGLRENDERBUFFERSTORAGEMULTISAMPLEPROC, glRenderbufferStorageMultisample); +GL_IMPORT____(false, PFNGLBINDFRAGDATALOCATIONPROC, glBindFragDataLocation); #else GL_IMPORT_EXT(false, PFNGLBINDFRAMEBUFFEREXTPROC, glBindFramebuffer); GL_IMPORT_EXT(false, PFNGLGENFRAMEBUFFERSEXTPROC, glGenFramebuffers); diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index e6a85e8a6..b7b560cd8 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -1109,6 +1109,10 @@ namespace bgfx GLint activeAttribs; GLint activeUniforms; +#if BGFX_CONFIG_RENDERER_OPENGL >= 31 + GL_CHECK(glBindFragDataLocation(m_id, 0, "bgfx_FragColor") ); +#endif // BGFX_CONFIG_RENDERER_OPENGL >= 31 + GL_CHECK(glGetProgramiv(m_id, GL_ACTIVE_ATTRIBUTES, &activeAttribs) ); GL_CHECK(glGetProgramiv(m_id, GL_ACTIVE_UNIFORMS, &activeUniforms) ); @@ -1910,6 +1914,31 @@ namespace bgfx } } } +#elif BGFX_CONFIG_RENDERER_OPENGL >= 31 + size_t codeLen = strlen(code); + size_t tempLen = codeLen + 1024; + char* temp = (char*)alloca(tempLen); + bx::StaticMemoryBlockWriter writer(temp, tempLen); + + writeString(&writer, "#version 140\n"); + if (_type == GL_FRAGMENT_SHADER) + { + writeString(&writer, "#define varying in\n"); + writeString(&writer, "#define texture2D texture\n"); + writeString(&writer, "#define texture3D texture\n"); + writeString(&writer, "#define textureCube texture\n"); + writeString(&writer, "out vec4 bgfx_FragColor;\n"); + writeString(&writer, "#define gl_FragColor bgfx_FragColor\n"); + } + else + { + writeString(&writer, "#define attribute in\n"); + writeString(&writer, "#define varying out\n"); + } + + bx::write(&writer, code, codeLen); + bx::write(&writer, '\0'); + code = temp; #endif // BGFX_CONFIG_RENDERER_OPENGLES2 GL_CHECK(glShaderSource(m_id, 1, (const GLchar**)&code, NULL) ); diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp index 43069670f..928b5fb5c 100644 --- a/tools/shaderc/shaderc.cpp +++ b/tools/shaderc/shaderc.cpp @@ -530,7 +530,7 @@ bool compileGLSLShader(bx::CommandLine& _cmdLine, const std::string& _code, bx:: } else { - writef(_writer, "#version %s\n\n", profile); +// writef(_writer, "#version %s\n\n", profile); } bx::write(_writer, optimizedShader, (int32_t)strlen(optimizedShader) ); @@ -1833,7 +1833,7 @@ int main(int _argc, const char* _argv[]) } else { - writef(&writer, "#version %s\n\n", profile); +// writef(&writer, "#version %s\n\n", profile); } } writer.write(preprocessor.m_preprocessed.c_str(), (int32_t)preprocessor.m_preprocessed.size() );