[Bf-blender-cvs] [9957f58111e] temp-gpu-compute-shaders: Cleanup: remove incorrect comments.
Jeroen Bakker
noreply at git.blender.org
Tue May 11 10:55:47 CEST 2021
Commit: 9957f58111e36ce3a5fada67fa5a34980f414623
Author: Jeroen Bakker
Date: Tue May 11 10:05:55 2021 +0200
Branches: temp-gpu-compute-shaders
https://developer.blender.org/rB9957f58111e36ce3a5fada67fa5a34980f414623
Cleanup: remove incorrect comments.
===================================================================
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M source/blender/gpu/tests/gpu_shader_test.cc
M source/tools
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 2cef4877edc..5ab29b1331d 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 2cef4877edc40875978c4e95322bb5193f5815bf
+Subproject commit 5ab29b1331d2103dae634b987f121c4599459d7f
diff --git a/release/scripts/addons b/release/scripts/addons
index bcd08a9506d..7324beddde4 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit bcd08a9506d33bdd7358201031b04d041ef22d94
+Subproject commit 7324beddde4695ce952188f9cdb6e21a9631eeed
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index f948f658ba3..7d78c8a63f2 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit f948f658ba33eb670a65e0bba058d43138abea7e
+Subproject commit 7d78c8a63f2f4b146f9327ddc0d567a5921b94ea
diff --git a/source/blender/gpu/tests/gpu_shader_test.cc b/source/blender/gpu/tests/gpu_shader_test.cc
index 752bb9be497..ef06307a9ae 100644
--- a/source/blender/gpu/tests/gpu_shader_test.cc
+++ b/source/blender/gpu/tests/gpu_shader_test.cc
@@ -189,7 +189,6 @@ void main() {
/* TODO(jbakker): Add function to copy it back to the VertexBuffer data. */
float *data = static_cast<float *>(glMapBuffer(GL_ARRAY_BUFFER, GL_READ_ONLY));
ASSERT_NE(data, nullptr);
- /* Create texture to load back result. */
for (int index = 0; index < SIZE; index++) {
float expected_value = index;
EXPECT_FLOAT_EQ(data[index * 4 + 0], expected_value);
@@ -247,12 +246,11 @@ void main() {
/* Check if compute has been done. */
GPU_memory_barrier(GPU_BARRIER_SHADER_STORAGE);
- /* Use opengl function to download the vertex buffer. */
+ /* Use opengl function to download the index buffer. */
/* TODO(jbakker): Add function to copy it back to the IndexBuffer data and accessors to read
* data. */
uint32_t *data = static_cast<uint32_t *>(glMapBuffer(GL_ELEMENT_ARRAY_BUFFER, GL_READ_ONLY));
ASSERT_NE(data, nullptr);
- /* Create texture to load back result. */
for (int index = 0; index < SIZE; index++) {
uint32_t expected = index;
EXPECT_EQ(data[index], expected);
diff --git a/source/tools b/source/tools
index 2afbb8ec472..f99d29ae3e6 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 2afbb8ec472cac5102eb239f57b006f8c9387685
+Subproject commit f99d29ae3e6ad44d45d79309454c45f8088781a4
More information about the Bf-blender-cvs
mailing list