diff --git a/drape/shaders/shader_index.txt b/drape/shaders/shader_index.txt
index 6e7901d4d7..5a89f758b4 100644
--- a/drape/shaders/shader_index.txt
+++ b/drape/shaders/shader_index.txt
@@ -1,5 +1,5 @@
-TEXTURING_PROGRAM texturing_vertex_shader.vsh texturing_fragment_shader.fsh
 LINE_PROGRAM line_vertex_shader.vsh line_fragment_shader.fsh
+TEXTURING_PROGRAM texturing_vertex_shader.vsh texturing_fragment_shader.fsh
 TEXT_PROGRAM text_vertex_shader.vsh text_fragment_shader.fsh
 COMPASS_PROGRAM compass_vertex_shader.vsh texturing_fragment_shader.fsh
 RULER_PROGRAM ruler_vertex_shader.vsh texturing_fragment_shader.fsh
diff --git a/tools/autobuild/shader_preprocessor.py b/tools/autobuild/shader_preprocessor.py
index 76634897d0..07e4e0b80e 100644
--- a/tools/autobuild/shader_preprocessor.py
+++ b/tools/autobuild/shader_preprocessor.py
@@ -27,6 +27,7 @@ def formatShaderDocName(shaderName):
 def readIndexFile(filePath):
     f = open(filePath)
     gpuPrograms = dict()
+    index = 0
     for line in f:
         lineParts = line.strip().split()
         if len(lineParts) != 3:
@@ -48,16 +49,14 @@ def readIndexFile(filePath):
             print("More than one difinition of %s gpu program" % lineParts[0])
             exit(13)
 
-        gpuPrograms[lineParts[0]] = (vertexShader, fragmentShader)
+        gpuPrograms[index] = (vertexShader, fragmentShader, lineParts[0])
+        index += 1
 
     return gpuPrograms
 
 def generateShaderIndexes(shaders):
     return dict((v, k) for k, v in enumerate(shaders))
 
-def generateProgramIndex(programs):
-    return dict((v, k) for k, v in enumerate(programs))
-
 def definitionChanged(newHeaderContent, defFilePath):
     if not os.path.isfile(defFilePath):
         return True
@@ -104,7 +103,7 @@ def writeDefinitionFile(programIndex):
     result += "};\n\n"
 
     for programName in programIndex.keys():
-        result += "extern int const %s;\n" % (programName)
+        result += "extern int const %s;\n" % (programIndex[programName][2])
 
     result += "\n"
     result += "void InitGpuProgramsLib(map<int, ProgramInfo> & gpuIndex);\n\n"
@@ -140,7 +139,7 @@ def writeShadersIndex(outputFile, shaderIndex):
     for shader in shaderIndex:
         outputFile.write("#define %s %s\n" % (formatShaderIndexName(shader), shaderIndex[shader]))
 
-def writeImplementationFile(programsDef, programIndex, shaderIndex, shaderDir, implFile, defFile, shaders):
+def writeImplementationFile(programsDef, shaderIndex, shaderDir, implFile, defFile, shaders):
     vertexShaders = [s for s in shaders if s.endswith(".vsh")]
     fragmentShaders = [s for s in shaders if s.endswith(".fsh")]
     file = open(formatOutFilePath(shaderDir, implFile), 'w')
@@ -161,8 +160,8 @@ def writeImplementationFile(programsDef, programIndex, shaderIndex, shaderDir, i
     file.write("vector<string> FragmentEnum;\n\n")
     file.write("#endif\n")
     file.write("//---------------------------------------------//\n")
-    for program in programIndex:
-        file.write("const int %s = %s;\n" % (program, programIndex[program]));
+    for program in programsDef:
+        file.write("const int %s = %s;\n" % (programsDef[program][2], program));
     file.write("//---------------------------------------------//\n")
     file.write("\n")
     file.write("ProgramInfo::ProgramInfo()\n")
@@ -207,17 +206,8 @@ def writeImplementationFile(programsDef, programIndex, shaderIndex, shaderDir, i
     file.write("} // namespace gpu\n")
     file.close()
 
-def validateDocumentation(shaders, shaderDir):
-    docFiles = [file for file in os.listdir(os.path.join(shaderDir, "doc"))]
 
-    undocumentedShaders = []
-    for shader in shaders:
-        if formatShaderDocName(shader) not in docFiles:
-            undocumentedShaders.append(shader)
-    # TODO(AlexZ): Commented out lines below to avoid qtcreator console spamming.
-    #if undocumentedShaders:
-        #print("no documentation for shaders:", undocumentedShaders)
-        #exit(20)
+###############################
 
 if len(sys.argv) < 4:
   print("Usage : " + sys.argv[0] + " <shader_dir> <index_file_name> <generate_file_name>")
@@ -232,15 +222,10 @@ shaders = [file for file in os.listdir(shaderDir) if os.path.isfile(os.path.join
 shaderIndex = generateShaderIndexes(shaders)
 
 programDefinition = readIndexFile(os.path.join(shaderDir, indexFileName))
-programIndex = generateProgramIndex(programDefinition)
 
-headerFile = writeDefinitionFile(programIndex)
+headerFile = writeDefinitionFile(programDefinition)
 if definitionChanged(headerFile, formatOutFilePath(shaderDir, definesFile)):
     f = open(formatOutFilePath(shaderDir, definesFile), 'w')
     f.write(headerFile)
     f.close()
-# TODO(AlexZ): Commented out lines below to avoid qtcreator console spamming.
-#else:
-    #print("No need to update definition file")
-writeImplementationFile(programDefinition, programIndex, shaderIndex, shaderDir, implFile, definesFile, shaders)
-validateDocumentation(shaders, shaderDir)
+writeImplementationFile(programDefinition, shaderIndex, shaderDir, implFile, definesFile, shaders)