Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/KhronosGroup/SPIRV-Cross.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Kristian Arntzen <hans-kristian.arntzen@arm.com>2016-05-23 14:30:02 +0300
committerHans-Kristian Arntzen <hans-kristian.arntzen@arm.com>2016-05-23 14:30:02 +0300
commit5ea59bd11b8d12ef40f3318d39ca4d95432ac432 (patch)
tree367510348de744d708649596567466640d36125c /include
parentefaf75e620beb6177d97ce73331838d435c5b00a (diff)
Non-functional: Update formatting.
Diffstat (limited to 'include')
-rw-r--r--include/spirv_cross/barrier.hpp2
-rw-r--r--include/spirv_cross/external_interface.h3
-rw-r--r--include/spirv_cross/internal_interface.hpp10
-rw-r--r--include/spirv_cross/thread_group.hpp41
4 files changed, 24 insertions, 32 deletions
diff --git a/include/spirv_cross/barrier.hpp b/include/spirv_cross/barrier.hpp
index 0d77b862..db7cd87e 100644
--- a/include/spirv_cross/barrier.hpp
+++ b/include/spirv_cross/barrier.hpp
@@ -17,8 +17,8 @@
#ifndef SPIRV_CROSS_BARRIER_HPP
#define SPIRV_CROSS_BARRIER_HPP
-#include <thread>
#include <atomic>
+#include <thread>
namespace spirv_cross
{
diff --git a/include/spirv_cross/external_interface.h b/include/spirv_cross/external_interface.h
index a0067fc1..3e7b1f8b 100644
--- a/include/spirv_cross/external_interface.h
+++ b/include/spirv_cross/external_interface.h
@@ -44,8 +44,7 @@ void spirv_cross_set_resource(spirv_cross_shader_t *thiz, unsigned set, unsigned
const struct spirv_cross_interface *spirv_cross_get_interface(void);
-typedef enum spirv_cross_builtin
-{
+typedef enum spirv_cross_builtin {
SPIRV_CROSS_BUILTIN_POSITION = 0,
SPIRV_CROSS_BUILTIN_FRAG_COORD = 1,
SPIRV_CROSS_BUILTIN_WORK_GROUP_ID = 2,
diff --git a/include/spirv_cross/internal_interface.hpp b/include/spirv_cross/internal_interface.hpp
index c3cbdcd5..3b53aa1a 100644
--- a/include/spirv_cross/internal_interface.hpp
+++ b/include/spirv_cross/internal_interface.hpp
@@ -29,13 +29,13 @@
#include <glm/glm.hpp>
-#include <assert.h>
-#include <stdint.h>
-#include "external_interface.h"
#include "barrier.hpp"
-#include "thread_group.hpp"
-#include "sampler.hpp"
+#include "external_interface.h"
#include "image.hpp"
+#include "sampler.hpp"
+#include "thread_group.hpp"
+#include <assert.h>
+#include <stdint.h>
namespace internal
{
diff --git a/include/spirv_cross/thread_group.hpp b/include/spirv_cross/thread_group.hpp
index 81a9bf36..7aab9595 100644
--- a/include/spirv_cross/thread_group.hpp
+++ b/include/spirv_cross/thread_group.hpp
@@ -17,9 +17,9 @@
#ifndef SPIRV_CROSS_THREAD_GROUP_HPP
#define SPIRV_CROSS_THREAD_GROUP_HPP
-#include <thread>
#include <condition_variable>
#include <mutex>
+#include <thread>
namespace spirv_cross
{
@@ -58,36 +58,29 @@ private:
void start(T *impl)
{
- worker = std::thread([impl, this]
- {
- for (;;)
- {
- {
- std::unique_lock<std::mutex> l{ lock };
- cond.wait(l, [this]
- {
- return state != Idle;
- });
- if (state == Dying)
- break;
- }
+ worker = std::thread([impl, this] {
+ for (;;)
+ {
+ {
+ std::unique_lock<std::mutex> l{ lock };
+ cond.wait(l, [this] { return state != Idle; });
+ if (state == Dying)
+ break;
+ }
- impl->main();
+ impl->main();
- std::lock_guard<std::mutex> l{ lock };
- state = Idle;
- cond.notify_one();
- }
- });
+ std::lock_guard<std::mutex> l{ lock };
+ state = Idle;
+ cond.notify_one();
+ }
+ });
}
void wait()
{
std::unique_lock<std::mutex> l{ lock };
- cond.wait(l, [this]
- {
- return state == Idle;
- });
+ cond.wait(l, [this] { return state == Idle; });
}
void run()