libgui|GLUniform: Setting contents of a vec3 array

skyjake · Sep 1, 2019 · 3a4a30f · 3a4a30f
1 parent 07ef7ec
commit 3a4a30f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/doomsday/libs/gui/include/de/graphics/gluniform.h b/doomsday/libs/gui/include/de/graphics/gluniform.h
@@ -122,6 +122,7 @@ class LIBGUI_PUBLIC GLUniform
     GLUniform &set(dint const *intArray, dsize count);
     GLUniform &set(float const *floatArray, dsize count);
     GLUniform &set(Vector2f const *vectorArray, dsize count);
+    GLUniform &set(Vector3f const *vectorArray, dsize count);
     GLUniform &set(Vector4f const *vectorArray, dsize count);
     GLUniform &set(Matrix4f const *mat4Array, dsize count);
 

diff --git a/doomsday/libs/gui/src/graphics/gluniform.cpp b/doomsday/libs/gui/src/graphics/gluniform.cpp
@@ -445,6 +445,17 @@ GLUniform &GLUniform::set(float const *floatArray, dsize count)
     return *this;
 }
 
+GLUniform &GLUniform::set(const Vector3f *vectorArray, dsize count)
+{
+    DENG2_ASSERT(d->type == Vec3Array);
+    DENG2_ASSERT(count <= d->elemCount);
+
+    memcpy(d->value.vector, vectorArray, sizeof(Vector3f) * count);
+    d->usedElemCount = duint16(count);
+    d->markAsChanged();
+    return *this;
+}
+
 GLUniform &GLUniform::set(Vector4f const *vectorArray, dsize count)
 {
     DENG2_ASSERT(d->type == Vec4Array);

diff --git a/doomsday/libs/gui/src/graphics/image.cpp b/doomsday/libs/gui/src/graphics/image.cpp
@@ -817,13 +817,13 @@ GLPixelFormat Image::glFormat(Format imageFormat)
         return GLPixelFormat(GL_RGBA8, GL_RGBA, GL_UNSIGNED_BYTE, 4);
 
     case R_16f:
-        return GLPixelFormat(GL_R16F, GL_RED, GL_FLOAT, 2);
+        return GLPixelFormat(GL_R16F, GL_RED, GL_FLOAT, 4);
 
     case RG_16f:
         return GLPixelFormat(GL_RG16F, GL_RG, GL_FLOAT, 4);
 
     case RGB_16f:
-        return GLPixelFormat(GL_RGB16F, GL_RGB, GL_FLOAT, 2);
+        return GLPixelFormat(GL_RGB16F, GL_RGB, GL_FLOAT, 4);
 
     case RGBA_16f:
         return GLPixelFormat(GL_RGBA16F, GL_RGBA, GL_FLOAT, 4);