Reenable rubber band

Without crash this time.
supertuxkart · Sep 1, 2014 · 79bbf44 · 79bbf44
1 parent 3bb13ab
commit 79bbf44
Showing 1 changed file with 43 additions and 5 deletions.
diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp
@@ -170,8 +170,6 @@ void STKMeshSceneNode::updatevbo()
     }
 }
 
-static video::ITexture *spareWhiteTex = 0;
-
 void STKMeshSceneNode::update()
 {
     Box = Mesh->getBoundingBox();
@@ -240,6 +238,21 @@ void STKMeshSceneNode::render()
             GLenum itype = mesh.IndexType;
             size_t count = mesh.IndexCount;
 
+            if (!mesh.textures[0])
+                mesh.textures[0] = getUnicolorTexture(video::SColor(255, 255, 255, 255));
+            compressTexture(mesh.textures[0], true);
+            if (UserConfigParams::m_azdo)
+            {
+#ifdef Bindless_Texture_Support
+                if (!mesh.TextureHandles[0])
+                    mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::TransparentFogShader::getInstance()->SamplersId[0]);
+                if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
+                    glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
+                MeshShader::ObjectPass1Shader::getInstance()->SetTextureHandles(createVector<uint64_t>(mesh.TextureHandles[0]));
+#endif
+            }
+            else
+                MeshShader::ObjectPass1Shader::getInstance()->SetTextureUnits(std::vector < GLuint > { getTextureGLuint(mesh.textures[0]) });
             MeshShader::ObjectPass1Shader::getInstance()->setUniforms(AbsoluteTransformation, invmodel);
             assert(mesh.vao);
             glBindVertexArray(mesh.vao);
@@ -256,8 +269,6 @@ void STKMeshSceneNode::render()
         AbsoluteTransformation.getInverse(invmodel);
 
         glDisable(GL_CULL_FACE);
-        if (!spareWhiteTex)
-            spareWhiteTex = getUnicolorTexture(video::SColor(255, 255, 255, 255));
         glUseProgram(MeshShader::ObjectPass2Shader::getInstance()->Program);
         // Only untextured
         for (unsigned i = 0; i < GLmeshes.size(); i++)
@@ -268,7 +279,34 @@ void STKMeshSceneNode::render()
             GLenum itype = mesh.IndexType;
             size_t count = mesh.IndexCount;
 
-            MeshShader::ObjectPass2Shader::getInstance()->SetTextureUnits(std::vector < GLuint > { getTextureGLuint(spareWhiteTex) });
+            if (UserConfigParams::m_azdo)
+            {
+#ifdef Bindless_Texture_Support
+                GLuint DiffuseHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_DIFFUSE), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[0]);
+                if (!glIsTextureHandleResidentARB(DiffuseHandle))
+                    glMakeTextureHandleResidentARB(DiffuseHandle);
+
+                GLuint SpecularHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_SPECULAR), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[1]);
+                if (!glIsTextureHandleResidentARB(SpecularHandle))
+                    glMakeTextureHandleResidentARB(SpecularHandle);
+
+                GLuint SSAOHandle = glGetTextureSamplerHandleARB(irr_driver->getRenderTargetTexture(RTT_HALF1_R), MeshShader::ObjectPass2Shader::getInstance()->SamplersId[2]);
+                if (!glIsTextureHandleResidentARB(SSAOHandle))
+                    glMakeTextureHandleResidentARB(SSAOHandle);
+
+                if (!mesh.TextureHandles[0])
+                    mesh.TextureHandles[0] = glGetTextureSamplerHandleARB(getTextureGLuint(mesh.textures[0]), MeshShader::TransparentFogShader::getInstance()->SamplersId[0]);
+                if (!glIsTextureHandleResidentARB(mesh.TextureHandles[0]))
+                    glMakeTextureHandleResidentARB(mesh.TextureHandles[0]);
+                MeshShader::ObjectPass2Shader::getInstance()->SetTextureHandles(createVector<uint64_t>(DiffuseHandle, SpecularHandle, SSAOHandle, mesh.TextureHandles[0]));
+#endif
+            }
+            else
+                MeshShader::ObjectPass2Shader::getInstance()->SetTextureUnits(createVector<GLuint>(
+                irr_driver->getRenderTargetTexture(RTT_DIFFUSE),
+                irr_driver->getRenderTargetTexture(RTT_SPECULAR),
+                irr_driver->getRenderTargetTexture(RTT_HALF1_R),
+                getTextureGLuint(mesh.textures[0])));
             MeshShader::ObjectPass2Shader::getInstance()->setUniforms(AbsoluteTransformation, mesh.TextureMatrix);
             assert(mesh.vao);
             glBindVertexArray(mesh.vao);