summaryrefslogtreecommitdiff
path: root/src/mbgl/programs/gl/fill.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/programs/gl/fill.cpp')
-rw-r--r--src/mbgl/programs/gl/fill.cpp51
1 files changed, 22 insertions, 29 deletions
diff --git a/src/mbgl/programs/gl/fill.cpp b/src/mbgl/programs/gl/fill.cpp
index 77c839850b..6195034e36 100644
--- a/src/mbgl/programs/gl/fill.cpp
+++ b/src/mbgl/programs/gl/fill.cpp
@@ -15,30 +15,7 @@ struct ShaderSource;
template <>
struct ShaderSource<FillProgram> {
static constexpr const char* name = "fill";
- static constexpr const uint8_t hash[8] = { 0x87, 0xea, 0x65, 0x7f, 0x0c, 0x9b, 0x97, 0x5d };
- static constexpr const auto vertexOffset = 12654;
- static constexpr const auto fragmentOffset = 13298;
-};
-
-constexpr const char* ShaderSource<FillProgram>::name;
-constexpr const uint8_t ShaderSource<FillProgram>::hash[8];
-
-} // namespace gl
-} // namespace programs
-
-namespace gfx {
-
-template <>
-std::unique_ptr<gfx::Program<FillProgram>>
-Backend::Create<gfx::Backend::Type::OpenGL>(const ProgramParameters& programParameters) {
- return std::make_unique<gl::Program<FillProgram>>(programParameters);
-}
-
-} // namespace gfx
-} // namespace mbgl
-
-// Uncompressed source of fill.vertex.glsl:
-/*
+ static constexpr const char* vertexSource = R"MBGL_SHADER(
attribute vec2 a_pos;
uniform mat4 u_matrix;
@@ -81,10 +58,8 @@ void main() {
gl_Position = u_matrix * vec4(a_pos, 0, 1);
}
-*/
-
-// Uncompressed source of fill.fragment.glsl:
-/*
+)MBGL_SHADER";
+ static constexpr const char* fragmentSource = R"MBGL_SHADER(
#ifndef HAS_UNIFORM_u_color
varying highp vec4 color;
@@ -119,5 +94,23 @@ void main() {
#endif
}
-*/
+)MBGL_SHADER";
+};
+
+constexpr const char* ShaderSource<FillProgram>::name;
+constexpr const char* ShaderSource<FillProgram>::vertexSource;
+constexpr const char* ShaderSource<FillProgram>::fragmentSource;
+
+} // namespace gl
+} // namespace programs
+
+namespace gfx {
+template <>
+std::unique_ptr<gfx::Program<FillProgram>>
+Backend::Create<gfx::Backend::Type::OpenGL>(const ProgramParameters& programParameters) {
+ return std::make_unique<gl::Program<FillProgram>>(programParameters);
+}
+
+} // namespace gfx
+} // namespace mbgl