diff options
author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2016-10-12 13:45:51 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-12 13:45:51 +0300 |
commit | 4fb9ee8a07301d85e882536380257410101cd89a (patch) | |
tree | 1d1673ab7df450b927a2def4ddfc1aabd6f904b9 /tools | |
parent | 39b46f097ad767d66883716dc9151d2deb2ddf6c (diff) | |
parent | 852dcba6ed0719bd9e8a6409583ff85cd654bcf6 (diff) |
Merge pull request #4480 from rokuz/fixed-texture-slots-using
Fixed using of texture slots in shaders
Diffstat (limited to 'tools')
-rw-r--r-- | tools/autobuild/shader_preprocessor.py | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/tools/autobuild/shader_preprocessor.py b/tools/autobuild/shader_preprocessor.py index 07e4e0b80e..e58da5d3bf 100644 --- a/tools/autobuild/shader_preprocessor.py +++ b/tools/autobuild/shader_preprocessor.py @@ -107,6 +107,7 @@ def writeDefinitionFile(programIndex): result += "\n" result += "void InitGpuProgramsLib(map<int, ProgramInfo> & gpuIndex);\n\n" + result += "uint8_t GetTextureSlotsCount(int gpuIndex);\n\n" result += "#if defined(COMPILER_TESTS)\n" result += "extern vector<string> VertexEnum;\n" result += "extern vector<string> FragmentEnum;\n\n" @@ -135,6 +136,18 @@ def writeShader(outputFile, shaderFile, shaderDir): outputFile.write(" %s \\n\\\n" % (outputLine)) outputFile.write(" \";\n\n") +def calcTextureSlots(vertexShaderFile, fragmentShaderFile, shaderDir): + slots = set() + for line in open(os.path.join(shaderDir, vertexShaderFile)): + line = line.replace(" ", "") + if (line.find("uniformsampler") != -1): + slots.add(line) + for line in open(os.path.join(shaderDir, fragmentShaderFile)): + line = line.replace(" ", "") + if (line.find("uniformsampler") != -1): + slots.add(line) + return len(slots) + def writeShadersIndex(outputFile, shaderIndex): for shader in shaderIndex: outputFile.write("#define %s %s\n" % (formatShaderIndexName(shader), shaderIndex[shader])) @@ -145,6 +158,7 @@ def writeImplementationFile(programsDef, shaderIndex, shaderDir, implFile, defFi file = open(formatOutFilePath(shaderDir, implFile), 'w') file.write("#include \"%s\"\n\n" % (defFile)) file.write("#include \"std/utility.hpp\"\n\n") + file.write("#include \"std/unordered_map.hpp\"\n\n") file.write("namespace gpu\n") file.write("{\n\n") @@ -191,6 +205,20 @@ def writeImplementationFile(programsDef, shaderIndex, shaderDir, implFile, defFi file.write(" gpuIndex.insert(make_pair(%s, ProgramInfo(%s, %s, %s, %s)));\n" % (program, vertexIndexName, fragmentIndexName, vertexSourceName, fragmentSourceName)) file.write("}\n\n") + + file.write("uint8_t GetTextureSlotsCount(int gpuIndex)\n") + file.write("{\n") + file.write(" static unordered_map<int, uint8_t> textureSlots;\n") + file.write(" if (textureSlots.empty())\n") + file.write(" {\n") + for program in programsDef.keys(): + vertexShader = programsDef[program][0] + fragmentShader = programsDef[program][1] + file.write(" textureSlots[%s] = %d;\n" % (programsDef[program][2], calcTextureSlots(vertexShader, fragmentShader, shaderDir))) + file.write(" }\n") + file.write(" return textureSlots[gpuIndex];\n") + file.write("}\n\n") + file.write("#if defined(COMPILER_TESTS)\n") file.write("void InitEnumeration()\n") file.write("{\n") |