From b472f2d5853f11064e93d1ce7c0b08c6c4b7b9a8 Mon Sep 17 00:00:00 2001
From: Philip Trettner <Philip.Trettner@rwth-aachen.de>
Date: Wed, 5 Jun 2019 15:27:25 +0200
Subject: [PATCH] new uniform proxy
---
extern/glow | 2 +-
extern/typed-geometry | 2 +-
tests/glow/uniforms.cc | 6 ++++++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/extern/glow b/extern/glow
index 4dc614d..0c7b279 160000
--- a/extern/glow
+++ b/extern/glow
@@ -1 +1 @@
-Subproject commit 4dc614d68c0eb5b65e5d605720a51aca12541d0e
+Subproject commit 0c7b279f5291f1f1aeaaa2d2c938bc1a688d1e29
diff --git a/extern/typed-geometry b/extern/typed-geometry
index b694f84..78c7657 160000
--- a/extern/typed-geometry
+++ b/extern/typed-geometry
@@ -1 +1 @@
-Subproject commit b694f841b56ad8d95c7a4a58f6efaa4081ad2fd6
+Subproject commit 78c765799fea9fa305e9cb9eda0ba5cefedaefde
diff --git a/tests/glow/uniforms.cc b/tests/glow/uniforms.cc
index 97844ef..c71065d 100644
--- a/tests/glow/uniforms.cc
+++ b/tests/glow/uniforms.cc
@@ -31,6 +31,7 @@ TEST_CASE("glow uniform interface")
uniform vec3 uColor3s[3];
uniform uvec3 uUVec3;
uniform float uFloatCArray[4];
+ uniform vec3 uDir3;
void main()
{
@@ -69,6 +70,7 @@ TEST_CASE("glow uniform interface")
data[i++] = uFloatCArray[1];
data[i++] = uFloatCArray[2];
data[i++] = uFloatCArray[3];
+ data[i++] = uDir3[0];
}
)");
auto prog = glow::Program::create(csh);
@@ -119,6 +121,8 @@ TEST_CASE("glow uniform interface")
float a[4] = {4, 5, 6, 7};
shader.uniform<float[]>("uFloatCArray") = a;
+ shader["uDir3"] = tg::dir3::pos_x;
+
shader.compute(1);
}
@@ -171,5 +175,7 @@ TEST_CASE("glow uniform interface")
CHECK(data[i++] == 5);
CHECK(data[i++] == 6);
CHECK(data[i++] == 7);
+ // uDir3
+ CHECK(data[i++] == 1);
}
}
--
GitLab