Mesa (staging/20.0): swr: Remove Byte Order Mark.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Apr 15 18:08:49 UTC 2020
Module: Mesa
Branch: staging/20.0
Commit: 721648e2a30918bced5345e0fc599e93054ae9b4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=721648e2a30918bced5345e0fc599e93054ae9b4
Author: Vinson Lee <vlee at freedesktop.org>
Date: Tue Mar 17 13:55:07 2020 -0700
swr: Remove Byte Order Mark.
before:
$ file src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py
src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py: Python script text executable, UTF-8 Unicode (with BOM) text
after:
$ file src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py
src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py: Python script text executable, ASCII text
This patch also fixes this build error.
File "src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py", line 1
# Copyright (C) 2014-2018 Intel Corporation. All Rights Reserved.
^
SyntaxError: invalid character in identifier
Fixes: c6e67f5a9373 ("gallium/swr: add OpenSWR rasterizer")
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Jan Zielinski <jan.zielinski at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4221>
(cherry picked from commit 68b40cfe2728889d4bd86ff073b3b69fb8608e5a)
---
.pick_status.json | 2 +-
src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.pick_status.json b/.pick_status.json
index 8a7780335a8..dc12bd777cd 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -283,7 +283,7 @@
"description": "swr: Remove Byte Order Mark.",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "c6e67f5a9373e916a8d2333585cb5787aa5f7bb7"
},
diff --git a/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py
index 8650220c086..c26f093c474 100644
--- a/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py
+++ b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 Intel Corporation. All Rights Reserved.
+# Copyright (C) 2014-2018 Intel Corporation. All Rights Reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
More information about the mesa-commit
mailing list