Mesa (main): microsoft/compiler: Miscellaneous fixes from running clang-format
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Aug 25 20:29:25 UTC 2021
Module: Mesa
Branch: main
Commit: 4a3395f35aeeb90f4613922dfe761dae62572f4b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4a3395f35aeeb90f4613922dfe761dae62572f4b
Author: Michael Tang <tangm at microsoft.com>
Date: Mon Aug 23 19:00:55 2021 -0700
microsoft/compiler: Miscellaneous fixes from running clang-format
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12513>
---
src/microsoft/compiler/dxil_signature.c | 4 ++--
src/microsoft/compiler/nir_to_dxil.c | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/microsoft/compiler/dxil_signature.c b/src/microsoft/compiler/dxil_signature.c
index ef28efc5174..6a1e7113b70 100644
--- a/src/microsoft/compiler/dxil_signature.c
+++ b/src/microsoft/compiler/dxil_signature.c
@@ -21,12 +21,12 @@
* IN THE SOFTWARE.
*/
+#include "dxil_signature.h"
#include "dxil_enums.h"
#include "dxil_module.h"
-#include "dxil_signature.h"
-#include "nir_to_dxil.h"
#include "glsl_types.h"
+#include "nir_to_dxil.h"
#include "util/u_debug.h"
#include <string.h>
diff --git a/src/microsoft/compiler/nir_to_dxil.c b/src/microsoft/compiler/nir_to_dxil.c
index 3601c8290e5..36eef27a651 100644
--- a/src/microsoft/compiler/nir_to_dxil.c
+++ b/src/microsoft/compiler/nir_to_dxil.c
@@ -23,18 +23,18 @@
#include "nir_to_dxil.h"
-#include "dxil_module.h"
#include "dxil_container.h"
-#include "dxil_function.h"
-#include "dxil_signature.h"
-#include "dxil_enums.h"
#include "dxil_dump.h"
+#include "dxil_enums.h"
+#include "dxil_function.h"
+#include "dxil_module.h"
#include "dxil_nir.h"
+#include "dxil_signature.h"
+#include "nir/nir_builder.h"
#include "util/u_debug.h"
-#include "util/u_math.h"
#include "util/u_dynarray.h"
-#include "nir/nir_builder.h"
+#include "util/u_math.h"
#include "git_sha1.h"
@@ -3696,7 +3696,7 @@ emit_deref(struct ntd_context* ctx, nir_deref_instr* instr)
if (!glsl_type_is_sampler(glsl_without_array(var->type)) &&
!glsl_type_is_image(glsl_without_array(var->type)))
- return true;
+ return true;
const struct glsl_type *type = instr->type;
const struct dxil_value *binding;
More information about the mesa-commit
mailing list