diff --git a/src/graphics/callbacks.hpp b/src/graphics/callbacks.hpp index 373d65323..72976161b 100644 --- a/src/graphics/callbacks.hpp +++ b/src/graphics/callbacks.hpp @@ -393,7 +393,6 @@ public: void setPosition(float x, float y, float z) { - const video::IVideoDriver * const drv = irr_driver->getVideoDriver(); // Sun "position" is actually a direction and not a position core::matrix4 m_view = irr_driver->getViewMatrix(); m_view.makeInverse(); diff --git a/src/graphics/glwrap.cpp b/src/graphics/glwrap.cpp index 75aac3ec9..bfb5a7e11 100644 --- a/src/graphics/glwrap.cpp +++ b/src/graphics/glwrap.cpp @@ -303,7 +303,7 @@ GLuint LoadTFBProgram(const char * vertex_file_path, const char **varyings, unsi glGetProgramiv(Program, GL_INFO_LOG_LENGTH, &InfoLogLength); char *ErrorMessage = new char[InfoLogLength]; glGetProgramInfoLog(Program, InfoLogLength, NULL, ErrorMessage); - printf(ErrorMessage); + Log::error("GLWrap", ErrorMessage); delete[] ErrorMessage; } diff --git a/src/graphics/material.cpp b/src/graphics/material.cpp index 821654cb1..873c2e4d5 100644 --- a/src/graphics/material.cpp +++ b/src/graphics/material.cpp @@ -757,7 +757,6 @@ void Material::setMaterialProperties(video::SMaterial *m, scene::IMeshBuffer* m if (m_shader_type == SHADERTYPE_SOLID && m_normal_map_tex.size() > 0) { - IVideoDriver* video_driver = irr_driver->getVideoDriver(); if (irr_driver->isGLSL()) { // FIXME; cannot perform this check atm, because setMaterialProperties diff --git a/src/graphics/post_processing.cpp b/src/graphics/post_processing.cpp index 63415e1f6..9fdbece98 100644 --- a/src/graphics/post_processing.cpp +++ b/src/graphics/post_processing.cpp @@ -207,10 +207,6 @@ void PostProcessing::update(float dt) static void renderBloom(GLuint in) { - float threshold = 1.0f; - if (World::getWorld() != NULL) - threshold = World::getWorld()->getTrack()->getBloomThreshold(); - glUseProgram(FullScreenShader::BloomShader::Program); glBindVertexArray(FullScreenShader::BloomShader::vao); @@ -676,7 +672,7 @@ static void averageTexture(GLuint tex) void PostProcessing::applyMLAA() { const core::vector2df &PIXEL_SIZE = core::vector2df(1.0f / UserConfigParams::m_width, 1.0f / UserConfigParams::m_height); - IVideoDriver *const drv = irr_driver->getVideoDriver(); + irr_driver->getFBO(FBO_MLAA_TMP).Bind(); glEnable(GL_STENCIL_TEST); glClearColor(0.0, 0.0, 0.0, 1.0); @@ -729,13 +725,6 @@ void PostProcessing::applyMLAA() /** Render the post-processed scene */ FrameBuffer *PostProcessing::render(scene::ICameraSceneNode * const camnode, bool isRace) { - IVideoDriver * const drv = irr_driver->getVideoDriver(); - - MotionBlurProvider * const mocb = (MotionBlurProvider *) irr_driver-> - getCallback(ES_MOTIONBLUR); - GaussianBlurProvider * const gacb = (GaussianBlurProvider *) irr_driver-> - getCallback(ES_GAUSSIAN3H); - FrameBuffer *in_fbo = &irr_driver->getFBO(FBO_COLORS); FrameBuffer *out_fbo = &irr_driver->getFBO(FBO_TMP1_WITH_DS); // Each effect uses these as named, and sets them up for the next effect. diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp index 7957a7f34..86a4adb2b 100644 --- a/src/graphics/render.cpp +++ b/src/graphics/render.cpp @@ -125,7 +125,6 @@ void IrrDriver::renderGLSL(float dt) RaceGUIBase *rg = world->getRaceGUI(); if (rg) rg->update(dt); - irr::video::COpenGLDriver* gl_driver = (irr::video::COpenGLDriver*)m_device->getVideoDriver(); for(unsigned int cam = 0; cam < Camera::getNumCameras(); cam++) { @@ -269,8 +268,6 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po renderSolidFirstPass(); PROFILER_POP_CPU_MARKER(); - const core::aabbox3df cambox = camnode->getViewFrustum()->getBoundingBox(); - // Shadows { PROFILER_PUSH_CPU_MARKER("- Shadow", 0x30, 0x6F, 0x90); diff --git a/src/graphics/rtts.cpp b/src/graphics/rtts.cpp index 346a40b38..8bdb08182 100644 --- a/src/graphics/rtts.cpp +++ b/src/graphics/rtts.cpp @@ -83,12 +83,10 @@ RTT::RTT(size_t width, size_t height) using namespace video; using namespace core; - IVideoDriver * const drv = irr_driver->getVideoDriver(); const dimension2du res(width, height); const dimension2du half = res/2; const dimension2du quarter = res/4; const dimension2du eighth = res/8; - const dimension2du sixteenth = res/16; const u16 shadowside = 1024; const dimension2du shadowsize0(shadowside, shadowside); diff --git a/src/graphics/shaders.cpp b/src/graphics/shaders.cpp index 65361166d..05daf7bb6 100644 --- a/src/graphics/shaders.cpp +++ b/src/graphics/shaders.cpp @@ -876,7 +876,6 @@ namespace MeshShader GLuint uniform_SpecularMap = glGetUniformLocation(Program, "SpecularMap"); GLuint uniform_SSAO = glGetUniformLocation(Program, "SSAO"); uniform_ambient = glGetUniformLocation(Program, "ambient"); - GLuint uniform_tex = glGetUniformLocation(Program, "tex"); if (!UserConfigParams::m_ubo_disabled) { GLuint uniform_ViewProjectionMatrixesUBO = glGetUniformBlockIndex(Program, "MatrixesData"); @@ -1100,7 +1099,6 @@ namespace MeshShader uniform_IMM = glGetUniformLocation(Program, "InverseModelMatrix"); uniform_ambient = glGetUniformLocation(Program, "ambient"); GLuint uniform_tex = glGetUniformLocation(Program, "tex"); - GLuint uniform_Albedo = glGetUniformLocation(Program, "Albedo"); GLuint uniform_DiffuseMap = glGetUniformLocation(Program, "DiffuseMap"); GLuint uniform_SpecularMap = glGetUniformLocation(Program, "SpecularMap"); GLuint uniform_SSAO = glGetUniformLocation(Program, "SSAO"); diff --git a/src/graphics/stkmesh.cpp b/src/graphics/stkmesh.cpp index 9a55e7145..12a740fcb 100644 --- a/src/graphics/stkmesh.cpp +++ b/src/graphics/stkmesh.cpp @@ -153,7 +153,7 @@ GLMesh allocateMeshBuffer(scene::IMeshBuffer* mb) glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, result.index_buffer); const void* indices = mb->getIndices(); u32 indexCount = mb->getIndexCount(); - GLenum indexSize; + size_t indexSize = 0; switch (mb->getIndexType()) { case irr::video::EIT_16BIT: @@ -232,7 +232,7 @@ core::vector3df getWind() { const float time = irr_driver->getDevice()->getTimer()->getTime() / 1000.0f; GrassShaderProvider *gsp = (GrassShaderProvider *)irr_driver->getCallback(ES_GRASS); - float m_speed = gsp->getSpeed(), m_amplitude = gsp->getAmplitude(); + float m_speed = gsp->getSpeed(); return m_speed * vector3df(1., 0., 0.) * cos(time); } @@ -387,8 +387,6 @@ void drawObjectRefPass2(const GLMesh &mesh, const core::matrix4 &ModelViewProjec glDrawElements(ptype, count, itype, 0); } -static video::ITexture *CausticTex = 0; - void drawGrassPass2(const GLMesh &mesh, const core::matrix4 & ModelViewProjectionMatrix, core::vector3df windDir) { irr_driver->IncreaseObjectCount(); diff --git a/src/graphics/stkmeshscenenode.cpp b/src/graphics/stkmeshscenenode.cpp index 2b8ff8800..2e87a9a29 100644 --- a/src/graphics/stkmeshscenenode.cpp +++ b/src/graphics/stkmeshscenenode.cpp @@ -220,7 +220,7 @@ void STKMeshSceneNode::updatevbo() glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mesh.index_buffer); const void* indices = mb->getIndices(); mesh.IndexCount = mb->getIndexCount(); - GLenum indexSize; + size_t indexSize = 0; switch (mb->getIndexType()) { case irr::video::EIT_16BIT: @@ -246,9 +246,6 @@ void STKMeshSceneNode::render() if (reload_each_frame) updatevbo(); - bool isTransparentPass = - SceneManager->getSceneNodeRenderPass() == scene::ESNRP_TRANSPARENT; - ++PassCount; Box = Mesh->getBoundingBox();