From 4d73ca3c582cf6fa8f9d36f5d752eb44efe71982 Mon Sep 17 00:00:00 2001
From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Sat, 5 Sep 2015 14:11:40 -0700
Subject: [PATCH] nir/spirv.h: Remove some cruft missed while merging

There were merge conflicts in spirv.h that got missed because they were in
a comment and so it still compiled.  This gets rid of them and we should be
on-par with upstream spirv->nir.
---
 src/glsl/nir/spirv.h | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/src/glsl/nir/spirv.h b/src/glsl/nir/spirv.h
index 8472caf30e5..d289c687c76 100644
--- a/src/glsl/nir/spirv.h
+++ b/src/glsl/nir/spirv.h
@@ -1,26 +1,12 @@
 /*
 ** Copyright (c) 2014-2015 The Khronos Group Inc.
-<<<<<<< HEAD
-** 
-=======
 **
->>>>>>> fdo-personal/nir-spirv
 ** Permission is hereby granted, free of charge, to any person obtaining a copy
 ** of this software and/or associated documentation files (the "Materials"),
 ** to deal in the Materials without restriction, including without limitation
 ** the rights to use, copy, modify, merge, publish, distribute, sublicense,
 ** and/or sell copies of the Materials, and to permit persons to whom the
 ** Materials are furnished to do so, subject to the following conditions:
-<<<<<<< HEAD
-** 
-** The above copyright notice and this permission notice shall be included in
-** all copies or substantial portions of the Materials.
-** 
-** MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS KHRONOS
-** STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
-** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/ 
-** 
-=======
 **
 ** The above copyright notice and this permission notice shall be included in
 ** all copies or substantial portions of the Materials.
@@ -29,7 +15,6 @@
 ** STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS SPECIFICATIONS AND
 ** HEADER INFORMATION ARE LOCATED AT https://www.khronos.org/registry/
 **
->>>>>>> fdo-personal/nir-spirv
 ** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 ** OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 ** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -48,21 +33,13 @@
 ** Specification revision 31.
 ** Enumeration tokens for SPIR-V, in various styles:
 **   C, C++, C++11, JSON, Lua, Python
-<<<<<<< HEAD
-** 
-=======
 **
->>>>>>> fdo-personal/nir-spirv
 ** - C will have tokens with a "Spv" prefix, e.g.: SpvSourceLanguageGLSL
 ** - C++ will have tokens in the "spv" name space, e.g.: spv::SourceLanguageGLSL
 ** - C++11 will use enum classes in the spv namespace, e.g.: spv::SourceLanguage::GLSL
 ** - Lua will use tables, e.g.: spv.SourceLanguage.GLSL
 ** - Python will use dictionaries, e.g.: spv['SourceLanguage']['GLSL']
-<<<<<<< HEAD
-** 
-=======
 **
->>>>>>> fdo-personal/nir-spirv
 ** Some tokens act like mask values, which can be OR'd together,
 ** while others are mutually exclusive.  The mask-like ones have
 ** "Mask" in their name, and a parallel enum that has the shift
-- 
2.30.2