From 8e1fc2522ee907da5fc3e65691990fd608539a72 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 11 Jun 2014 23:44:25 +0300 Subject: Use only one shader program for all drawing. --- src/render/shaders/shadersmanager.cpp | 6 ------ src/render/shaders/shadersmanager.h | 2 -- 2 files changed, 8 deletions(-) (limited to 'src/render/shaders') diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp index 8a1072deb..2c37f56d5 100644 --- a/src/render/shaders/shadersmanager.cpp +++ b/src/render/shaders/shadersmanager.cpp @@ -119,10 +119,4 @@ ShaderProgram *ShadersManager::getSimpleProgram() dir + paths.getStringValue("simpleFragmentShader")); } -ShaderProgram *ShadersManager::getTextureProgram() -{ - const std::string dir = paths.getStringValue("shaders"); - return createProgram(dir + paths.getStringValue("textureVertexShader"), - dir + paths.getStringValue("textureFragmentShader")); -} #endif diff --git a/src/render/shaders/shadersmanager.h b/src/render/shaders/shadersmanager.h index b525d18e1..50e714aba 100644 --- a/src/render/shaders/shadersmanager.h +++ b/src/render/shaders/shadersmanager.h @@ -41,8 +41,6 @@ class ShadersManager final A_WARN_UNUSED; ShaderProgram *getSimpleProgram(); - - ShaderProgram *getTextureProgram(); }; extern ShadersManager shaders; -- cgit v1.2.3-70-g09d2