Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 846 vs 867 for /trunk/Source Code/Platform/Video/OpenGL/Shaders/glShader.cpp

Diff revisions: vs.
  @@ -13,7 +13,7 @@
13 13
14 14 SharedLock glShader::_shaderNameLock;
15 15 glShader::ShaderMap glShader::_shaderNameMap;
16 - stringImpl glShader::shaderAtomLocationPrefix[to_const_uint(ShaderType::COUNT) + 1];
16 + stringImpl glShader::shaderAtomLocationPrefix[to_const_U32(ShaderType::COUNT) + 1];
17 17
18 18 IMPLEMENT_CUSTOM_ALLOCATOR(glShader, 0, 0);
19 19 glShader::glShader(GFXDevice& context,
  @@ -53,16 +53,16 @@
53 53 break;
54 54 };
55 55
56 - if (shaderAtomLocationPrefix[to_const_uint(ShaderType::VERTEX)].empty()) {
56 + if (shaderAtomLocationPrefix[to_const_U32(ShaderType::VERTEX)].empty()) {
57 57 stringImpl locPrefix(Paths::g_assetsLocation + Paths::g_shadersLocation + Paths::Shaders::GLSL::g_parentShaderLoc);
58 58
59 - shaderAtomLocationPrefix[to_const_uint(ShaderType::FRAGMENT)] = locPrefix + Paths::Shaders::GLSL::g_fragAtomLoc;
60 - shaderAtomLocationPrefix[to_const_uint(ShaderType::VERTEX)] = locPrefix + Paths::Shaders::GLSL::g_vertAtomLoc;
61 - shaderAtomLocationPrefix[to_const_uint(ShaderType::GEOMETRY)] = locPrefix + Paths::Shaders::GLSL::g_geomAtomLoc;
62 - shaderAtomLocationPrefix[to_const_uint(ShaderType::TESSELATION_CTRL)] = locPrefix + Paths::Shaders::GLSL::g_tescAtomLoc;
63 - shaderAtomLocationPrefix[to_const_uint(ShaderType::TESSELATION_EVAL)] = locPrefix + Paths::Shaders::GLSL::g_teseAtomLoc;
64 - shaderAtomLocationPrefix[to_const_uint(ShaderType::COMPUTE)] = locPrefix + Paths::Shaders::GLSL::g_compAtomLoc;
65 - shaderAtomLocationPrefix[to_const_uint(ShaderType::COUNT)] = locPrefix + Paths::Shaders::GLSL::g_comnAtomLoc;
59 + shaderAtomLocationPrefix[to_const_U32(ShaderType::FRAGMENT)] = locPrefix + Paths::Shaders::GLSL::g_fragAtomLoc;
60 + shaderAtomLocationPrefix[to_const_U32(ShaderType::VERTEX)] = locPrefix + Paths::Shaders::GLSL::g_vertAtomLoc;
61 + shaderAtomLocationPrefix[to_const_U32(ShaderType::GEOMETRY)] = locPrefix + Paths::Shaders::GLSL::g_geomAtomLoc;
62 + shaderAtomLocationPrefix[to_const_U32(ShaderType::TESSELATION_CTRL)] = locPrefix + Paths::Shaders::GLSL::g_tescAtomLoc;
63 + shaderAtomLocationPrefix[to_const_U32(ShaderType::TESSELATION_EVAL)] = locPrefix + Paths::Shaders::GLSL::g_teseAtomLoc;
64 + shaderAtomLocationPrefix[to_const_U32(ShaderType::COMPUTE)] = locPrefix + Paths::Shaders::GLSL::g_compAtomLoc;
65 + shaderAtomLocationPrefix[to_const_U32(ShaderType::COUNT)] = locPrefix + Paths::Shaders::GLSL::g_comnAtomLoc;
66 66 }
67 67 }
68 68
  @@ -170,7 +170,7 @@
170 170 DIVIDE_UNEXPECTED_CALL("Invalid shader include type");
171 171 }
172 172
173 - include_string = ShaderProgram::shaderFileRead(include_file, shaderAtomLocationPrefix[to_uint(typeIndex)]);
173 + include_string = ShaderProgram::shaderFileRead(include_file, shaderAtomLocationPrefix[to_U32(typeIndex)]);
174 174
175 175 if (include_string.empty()) {
176 176 Console::errorfn(Locale::get(_ID("ERROR_GLSL_NO_INCLUDE_FILE")),