Merge branch 'master' of github.com:supertuxkart/stk-code

data/shaders/detailledobject_pass2.frag

@@ -1,5 +1,10 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D Albedo;
+layout(bindless_sampler) uniform sampler2D Detail;
+#else
 uniform sampler2D Albedo;
 uniform sampler2D Detail;
+#endif
 
 #if __VERSION__ >= 130
 in vec2 uv;
@@ -16,6 +21,9 @@ vec3 getLightFactor(float specMapValue);
 void main(void)
 {
     vec4 color = texture(Albedo, uv);
+#ifdef GL_ARB_bindless_texture
+    color.xyz = pow(color.xyz, vec3(2.2));
+#endif
     vec4 detail = texture(Detail, uv_bis);
     color *= detail;
     vec3 LightFactor = getLightFactor(1. - color.a);

data/shaders/grass_pass2.frag

@@ -1,6 +1,12 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D Albedo;
+layout(bindless_sampler) uniform sampler2D dtex;
+#else
 uniform sampler2D Albedo;
-uniform vec3 SunDir;
 uniform sampler2D dtex;
+#endif
+
+uniform vec3 SunDir;
 
 in vec3 nor;
 in vec2 uv;
@@ -26,6 +32,9 @@ void main(void)
     float scattering = mix(fPowEdotL, fLdotNBack, .5);
 
     vec4 color = texture(Albedo, uv);
+#ifdef GL_ARB_bindless_texture
+    color.xyz = pow(color.xyz, vec3(2.2));
+#endif
     if (color.a < 0.5) discard;
     vec3 LightFactor = (scattering * 0.3) + getLightFactor(1.);
     FragColor = vec4(color.xyz * LightFactor, 1.);

data/shaders/header.txt

@@ -14,4 +14,4 @@ layout (std140) uniform MatrixesData
     mat4 ShadowViewProjMatrixes[4];
     vec2 screen;
 };
-#endif
+#endif

data/shaders/normalmap.frag

@@ -1,5 +1,10 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D normalMap;
+layout(bindless_sampler) uniform sampler2D DiffuseForAlpha;
+#else
 uniform sampler2D normalMap;
 uniform sampler2D DiffuseForAlpha;
+#endif
 
 in vec3 tangent;
 in vec3 bitangent;

data/shaders/object_pass1.frag

@@ -1,4 +1,8 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D tex;
+#else
 uniform sampler2D tex;
+#endif
 
 #if __VERSION__ >= 130
 in vec3 nor;

data/shaders/object_pass2.frag

@@ -1,4 +1,8 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D Albedo;
+#else
 uniform sampler2D Albedo;
+#endif
 
 in vec2 uv;
 in vec4 color;
@@ -8,7 +12,11 @@ vec3 getLightFactor(float specMapValue);
 
 void main(void)
 {
+#ifdef GL_ARB_bindless_texture
+    vec4 col = pow(texture(Albedo, uv), vec4(2.2));
+#else
     vec4 col = texture(Albedo, uv);
+#endif
     col.xyz *= pow(color.xyz, vec3(2.2));
     vec3 LightFactor = getLightFactor(1.);
     FragColor = vec4(col.xyz * LightFactor, 1.);

data/shaders/object_unlit.frag

@@ -1,4 +1,8 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D tex;
+#else
 uniform sampler2D tex;
+#endif
 
 in vec2 uv;
 in vec4 color;
@@ -7,6 +11,9 @@ out vec4 FragColor;
 void main(void)
 {
     vec4 col = texture(tex, uv);
+#ifdef GL_ARB_bindless_texture
+    col.xyz = pow(col.xyz, vec3(2.2));
+#endif
     col.xyz *= pow(color.xyz, vec3(2.2));
     if (col.a < 0.5) discard;
     FragColor = vec4(col.xyz, 1.);

data/shaders/objectpass_spheremap.frag

@@ -1,6 +1,10 @@
 // See http://www.ozone3d.net/tutorials/glsl_texturing_p04.php for ref
 
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D tex;
+#else
 uniform sampler2D tex;
+#endif
 
 #if __VERSION__ >= 130
 in vec3 nor;
@@ -21,6 +25,9 @@ void main() {
     float m = 2.0 * sqrt(r.x * r.x + r.y * r.y + (r.z + 1.0) * (r.z + 1.0));
     r.y = - r.y;
     vec4 detail0 = texture(tex, r.xy / m + .5);
+#ifdef GL_ARB_bindless_texture
+    detail0.xyz = pow(detail0.xyz, vec3(2.2));
+#endif
     vec3 LightFactor = getLightFactor(1.);
 
     FragColor = vec4(detail0.xyz * LightFactor, 1.);

data/shaders/objectref_pass1.frag

@@ -1,4 +1,8 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D tex;
+#else
 uniform sampler2D tex;
+#endif
 
 #if __VERSION__ >= 130
 in vec3 nor;

data/shaders/objectref_pass2.frag

@@ -1,4 +1,8 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D Albedo;
+#else
 uniform sampler2D Albedo;
+#endif
 
 in vec2 uv;
 in vec4 color;
@@ -9,6 +13,9 @@ vec3 getLightFactor(float specMapValue);
 void main(void)
 {
     vec4 col = texture(Albedo, uv);
+#ifdef GL_ARB_bindless_texture
+    col.xyz = pow(col.xyz, vec3(2.2));
+#endif
     col.xyz *= pow(color.xyz, vec3(2.2));
     if (col.a * color.a < 0.5) discard;
     vec3 LightFactor = getLightFactor(1.);

data/shaders/splatting.frag

@@ -1,8 +1,16 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D tex_layout;
+layout(bindless_sampler) uniform sampler2D tex_detail0;
+layout(bindless_sampler) uniform sampler2D tex_detail1;
+layout(bindless_sampler) uniform sampler2D tex_detail2;
+layout(bindless_sampler) uniform sampler2D tex_detail3;
+#else
 uniform sampler2D tex_layout;
 uniform sampler2D tex_detail0;
 uniform sampler2D tex_detail1;
 uniform sampler2D tex_detail2;
 uniform sampler2D tex_detail3;
+#endif
 
 #if __VERSION__ >= 130
 in vec2 uv;
@@ -24,6 +32,12 @@ void main() {
     vec4 detail2 = texture(tex_detail2, uv);
     vec4 detail3 = texture(tex_detail3, uv);
     vec4 detail4 = vec4(0.0);
+#ifdef GL_ARB_bindless_texture
+    detail0.xyz = pow(detail0.xyz, vec3(2.2));
+    detail1.xyz = pow(detail1.xyz, vec3(2.2));
+    detail2.xyz = pow(detail2.xyz, vec3(2.2));
+    detail3.xyz = pow(detail3.xyz, vec3(2.2));
+#endif
 
     vec4 splatted = splatting.r * detail0 +
         splatting.g * detail1 +

data/shaders/transparent.frag

@@ -1,4 +1,8 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D tex;
+#else
 uniform sampler2D tex;
+#endif
 
 in vec2 uv;
 in vec4 color;
@@ -8,6 +12,9 @@ out vec4 FragColor;
 void main()
 {
     vec4 Color = texture(tex, uv);
+#ifdef GL_ARB_bindless_texture
+    Color.xyz = pow(Color.xyz, vec3(2.2));
+#endif
     Color.xyz *= pow(color.xyz, vec3(2.2));
     Color.a *= color.a;
     // Premultiply alpha

data/shaders/transparentfog.frag

@@ -1,4 +1,9 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D tex;
+#else
 uniform sampler2D tex;
+#endif
+
 
 uniform float fogmax;
 uniform float startH;
@@ -15,6 +20,9 @@ out vec4 FragColor;
 void main()
 {
     vec4 diffusecolor = texture(tex, uv);
+#ifdef GL_ARB_bindless_texture
+    diffusecolor.xyz = pow(diffusecolor.xyz, vec3(2.2));
+#endif
     diffusecolor.xyz *= pow(color.xyz, vec3(2.2));
     diffusecolor.a *= color.a;
     vec3 tmp = vec3(gl_FragCoord.xy / screen, gl_FragCoord.z);

data/shaders/utils/getLightFactor.frag

@@ -1,6 +1,12 @@
+#ifdef GL_ARB_bindless_texture
+layout(bindless_sampler) uniform sampler2D DiffuseMap;
+layout(bindless_sampler) uniform sampler2D SpecularMap;
+layout(bindless_sampler) uniform sampler2D SSAO;
+#else
 uniform sampler2D DiffuseMap;
 uniform sampler2D SpecularMap;
 uniform sampler2D SSAO;
+#endif
 
 vec3 getLightFactor(float specMapValue)
 {

src/config/user_config.hpp

@@ -464,6 +464,9 @@ namespace UserConfigParams
     PARAM_PREFIX BoolUserConfigParam        m_gi
         PARAM_DEFAULT(BoolUserConfigParam(false, "enable_gi",
         &m_video_group, "Enable Global Illumination"));
+    PARAM_PREFIX BoolUserConfigParam        m_bindless_textures
+        PARAM_DEFAULT(BoolUserConfigParam(false, "enable_bindless_textures",
+        &m_video_group, "Enable Bindless Texture (Experimental !)"));
 
     // ---- Debug - not saved to config file
     /** If gamepad debugging is enabled. */

src/graphics/gl_headers.hpp

@@ -72,6 +72,8 @@ extern PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
 extern PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
 extern PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
 extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;
+extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC glDrawElementsInstancedBaseVertexBaseInstance;
+extern PFNGLMULTIDRAWELEMENTSINDIRECTPROC glMultiDrawElementsIndirect;
 extern PFNGLDELETEBUFFERSPROC glDeleteBuffers;
 extern PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
 extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
@@ -80,6 +82,9 @@ extern PFNGLTEXBUFFERPROC glTexBuffer;
 extern PFNGLBUFFERSUBDATAPROC glBufferSubData;
 extern PFNGLMAPBUFFERPROC glMapBuffer;
 extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
+extern PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange;
+extern PFNGLMEMORYBARRIERPROC glMemoryBarrier;
+extern PFNGLBUFFERSTORAGEPROC glBufferStorage;
 extern PFNGLUNMAPBUFFERPROC glUnmapBuffer;
 extern PFNGLFENCESYNCPROC glFenceSync;
 extern PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
@@ -109,9 +114,20 @@ extern PFNGLDELETESAMPLERSPROC glDeleteSamplers;
 extern PFNGLBINDSAMPLERPROC glBindSampler;
 extern PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
 extern PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
+extern PFNGLGETTEXTURESAMPLERHANDLEARBPROC glGetTextureSamplerHandleARB;
+extern PFNGLMAKETEXTUREHANDLERESIDENTARBPROC glMakeTextureHandleResidentARB;
+extern PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC glMakeTextureHandleNonResidentARB;
+extern PFNGLUNIFORMHANDLEUI64ARBPROC glUniformHandleui64ARB;
+extern PFNGLISTEXTUREHANDLERESIDENTARBPROC glIsTextureHandleResidentARB;
+extern PFNGLVERTEXATTRIBLPOINTERPROC glVertexAttribLPointer;
 #ifdef DEBUG
 extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
 #endif
 #endif
 
+
+#ifdef WIN32
+#define Bindless_Texture_Support
+#endif
+
 #endif

src/graphics/glwrap.cpp

@@ -52,6 +52,8 @@ PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
 PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
 PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;
 PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;
+PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC glDrawElementsInstancedBaseVertexBaseInstance;
+PFNGLMULTIDRAWELEMENTSINDIRECTPROC glMultiDrawElementsIndirect;
 PFNGLDELETEBUFFERSPROC glDeleteBuffers;
 PFNGLGENVERTEXARRAYSPROC glGenVertexArrays;
 PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
@@ -60,6 +62,9 @@ PFNGLTEXBUFFERPROC glTexBuffer;
 PFNGLBUFFERSUBDATAPROC glBufferSubData;
 PFNGLMAPBUFFERPROC glMapBuffer;
 PFNGLMAPBUFFERRANGEPROC glMapBufferRange;
+PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange;
+PFNGLMEMORYBARRIERPROC glMemoryBarrier;
+PFNGLBUFFERSTORAGEPROC glBufferStorage;
 PFNGLUNMAPBUFFERPROC glUnmapBuffer;
 PFNGLFENCESYNCPROC glFenceSync;
 PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
@@ -91,6 +96,12 @@ PFNGLBINDSAMPLERPROC glBindSampler;
 PFNGLSAMPLERPARAMETERFPROC glSamplerParameterf;
 PFNGLSAMPLERPARAMETERIPROC glSamplerParameteri;
 PFNGLGETSTRINGIPROC glGetStringi;
+PFNGLGETTEXTURESAMPLERHANDLEARBPROC glGetTextureSamplerHandleARB;
+PFNGLMAKETEXTUREHANDLERESIDENTARBPROC glMakeTextureHandleResidentARB;
+PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC glMakeTextureHandleNonResidentARB;
+PFNGLUNIFORMHANDLEUI64ARBPROC glUniformHandleui64ARB;
+PFNGLISTEXTUREHANDLERESIDENTARBPROC glIsTextureHandleResidentARB;
+PFNGLVERTEXATTRIBLPOINTERPROC glVertexAttribLPointer;
 #endif
 
 static bool is_gl_init = false;
@@ -192,6 +203,9 @@ void initGL()
     glBufferData = (PFNGLBUFFERDATAPROC)IRR_OGL_LOAD_EXTENSION("glBufferData");
     glMapBuffer = (PFNGLMAPBUFFERPROC)IRR_OGL_LOAD_EXTENSION("glMapBuffer");
     glMapBufferRange = (PFNGLMAPBUFFERRANGEPROC)IRR_OGL_LOAD_EXTENSION("glMapBufferRange");
+    glFlushMappedBufferRange = (PFNGLFLUSHMAPPEDBUFFERRANGEPROC)IRR_OGL_LOAD_EXTENSION("glFlushMappedBufferRange");
+    glMemoryBarrier = (PFNGLMEMORYBARRIERPROC)IRR_OGL_LOAD_EXTENSION("glMemoryBarrier");
+    glBufferStorage = (PFNGLBUFFERSTORAGEPROC)IRR_OGL_LOAD_EXTENSION("glBufferStorage");
     glUnmapBuffer = (PFNGLUNMAPBUFFERPROC)IRR_OGL_LOAD_EXTENSION("glUnmapBuffer");
     glFenceSync = (PFNGLFENCESYNCPROC)IRR_OGL_LOAD_EXTENSION("glFenceSync");
     glClientWaitSync = (PFNGLCLIENTWAITSYNCPROC)IRR_OGL_LOAD_EXTENSION("glClientWaitSync");
@@ -229,6 +243,8 @@ void initGL()
     glDrawElementsBaseVertex = (PFNGLDRAWELEMENTSBASEVERTEXPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsBaseVertex");
     glDrawElementsInstanced = (PFNGLDRAWELEMENTSINSTANCEDPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsInstanced");
     glDrawElementsInstancedBaseVertex = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsInstancedBaseVertex");
+    glDrawElementsInstancedBaseVertexBaseInstance = (PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC)IRR_OGL_LOAD_EXTENSION("glDrawElementsInstancedBaseVertexBaseInstance");
+    glMultiDrawElementsIndirect = (PFNGLMULTIDRAWELEMENTSINDIRECTPROC)IRR_OGL_LOAD_EXTENSION("glMultiDrawElementsIndirect");
     glDeleteBuffers = (PFNGLDELETEBUFFERSPROC)IRR_OGL_LOAD_EXTENSION("glDeleteBuffers");
     glGenVertexArrays = (PFNGLGENVERTEXARRAYSPROC)IRR_OGL_LOAD_EXTENSION("glGenVertexArrays");
     glBindVertexArray = (PFNGLBINDVERTEXARRAYPROC)IRR_OGL_LOAD_EXTENSION("glBindVertexArray");
@@ -264,6 +280,12 @@ void initGL()
     glSamplerParameterf = (PFNGLSAMPLERPARAMETERFPROC)IRR_OGL_LOAD_EXTENSION("glSamplerParameterf");
     glSamplerParameteri = (PFNGLSAMPLERPARAMETERIPROC)IRR_OGL_LOAD_EXTENSION("glSamplerParameteri");
     glGetStringi = (PFNGLGETSTRINGIPROC)IRR_OGL_LOAD_EXTENSION("glGetstringi");
+    glGetTextureSamplerHandleARB = (PFNGLGETTEXTURESAMPLERHANDLEARBPROC)IRR_OGL_LOAD_EXTENSION("glGetTextureSamplerHandleARB");
+    glMakeTextureHandleResidentARB = (PFNGLMAKETEXTUREHANDLERESIDENTARBPROC)IRR_OGL_LOAD_EXTENSION("glMakeTextureHandleResidentARB");
+    glMakeTextureHandleNonResidentARB = (PFNGLMAKETEXTUREHANDLENONRESIDENTARBPROC)IRR_OGL_LOAD_EXTENSION("glMakeTextureHandleNonResidentARB");
+    glUniformHandleui64ARB = (PFNGLUNIFORMHANDLEUI64ARBPROC)IRR_OGL_LOAD_EXTENSION("glUniformHandleui64ARB");
+    glIsTextureHandleResidentARB = (PFNGLISTEXTUREHANDLERESIDENTARBPROC)IRR_OGL_LOAD_EXTENSION("glIsTextureHandleResidentARB");
+    glVertexAttribLPointer = (PFNGLVERTEXATTRIBLPOINTERPROC)IRR_OGL_LOAD_EXTENSION("glVertexAttribLPointer");
 #ifdef DEBUG
     glDebugMessageCallbackARB = (PFNGLDEBUGMESSAGECALLBACKARBPROC)IRR_OGL_LOAD_EXTENSION("glDebugMessageCallbackARB");
 #endif
@@ -297,6 +319,13 @@ GLuint LoadShader(const char * file, unsigned type)
     char versionString[20];
     sprintf(versionString, "#version %d\n", irr_driver->getGLSLVersion());
     std::string Code = versionString;
+    if (UserConfigParams::m_bindless_textures)
+        Code += "#extension GL_ARB_bindless_texture : enable\n";
+    else
+    {
+        Code += "#extension GL_ARB_bindless_texture : disable\n";
+        Code += "#undef GL_ARB_bindless_texture\n";
+    }
     std::ifstream Stream(file, std::ios::in);
     Code += "//" + std::string(file) + "\n";
     if (irr_driver->needUBOWorkaround())