less copying

openmobilemaps · Jan 22, 2024 · 96d6132 · 96d6132
1 parent 3cd2ac4
commit 96d6132
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/android/src/main/cpp/graphics/shader/ColorLineGroup2dShaderOpenGl.cpp b/android/src/main/cpp/graphics/shader/ColorLineGroup2dShaderOpenGl.cpp
@@ -50,7 +50,7 @@ void ColorLineGroup2dShaderOpenGl::preRender(const std::shared_ptr<::RenderingCo
             return;
         }
         int lineStylesHandle = glGetUniformLocation(program, "lineValues");
-        glUniform1fv(lineStylesHandle, sizeLineValuesArray, &lineValues[0]);
+        glUniform1fv(lineStylesHandle, numStyles * sizeLineValues, &lineValues[0]);
         int numStylesHandle = glGetUniformLocation(program, "numStyles");
         glUniform1i(numStylesHandle, numStyles);
         int dashingScaleFactorHandle = glGetUniformLocation(program, "dashingScaleFactor");

diff --git a/android/src/main/cpp/graphics/shader/ColorPolygonGroup2dShaderOpenGl.cpp b/android/src/main/cpp/graphics/shader/ColorPolygonGroup2dShaderOpenGl.cpp
@@ -53,7 +53,7 @@ void ColorPolygonGroup2dShaderOpenGl::preRender(const std::shared_ptr<::Renderin
             return;
         }
         int lineStylesHandle = glGetUniformLocation(program, "polygonStyles");
-        glUniform1fv(lineStylesHandle, sizeStyleValuesArray, &polygonStyles[0]);
+        glUniform1fv(lineStylesHandle, numStyles * sizeStyleValues, &polygonStyles[0]);
         int numStylesHandle = glGetUniformLocation(program, "numStyles");
         glUniform1i(numStylesHandle, numStyles);
     }
@@ -66,6 +66,7 @@ void ColorPolygonGroup2dShaderOpenGl::setStyles(const ::SharedBytes & styles) {
             std::memcpy(this->polygonStyles.data(), (void *) styles.address,
                     styles.elementCount * styles.bytesPerElement);
         }
+
         this->numStyles = styles.elementCount;
     }
 }