From a982ffbbec84e99f2f9306c554a22fd117676aa3 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Thu, 28 Aug 2014 11:56:29 +0800 Subject: icd: rename and prefix shader_il.h Rename shader_il.h to icd-bil.h, and make it more C compatible. Prefix everything with icd_. --- icd/common/icd-bil.h | 39 +++++++++++++++++++++++++++++++++++++++ icd/common/shader_il.h | 37 ------------------------------------- 2 files changed, 39 insertions(+), 37 deletions(-) create mode 100644 icd/common/icd-bil.h delete mode 100644 icd/common/shader_il.h diff --git a/icd/common/icd-bil.h b/icd/common/icd-bil.h new file mode 100644 index 00000000..43cc354c --- /dev/null +++ b/icd/common/icd-bil.h @@ -0,0 +1,39 @@ +/* + * XGL + * + * Copyright (C) 2014 LunarG, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS 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 + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef ICD_BIL_H +#define ICD_BIL_H + +#include + +#define ICD_BIL_MAGIC 0x07230203 +#define ICD_BIL_VERSION 99 + +struct icd_bil_header { + uint32_t magic; + uint32_t version; + uint32_t gen_magic; // Generator's magic number +}; + +#endif /* ICD_BIL_H */ diff --git a/icd/common/shader_il.h b/icd/common/shader_il.h deleted file mode 100644 index 155ca36d..00000000 --- a/icd/common/shader_il.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * XGL - * - * Copyright (C) 2014 LunarG, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS 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 - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ - -#ifndef SHADER_IL_H -#define SHADER_IL_H - -const int BILMagicNumber = 0x07230203; -const int BILVersion = 99; - -struct bil_header { - uint32_t bil_magic; - uint32_t bil_version; - uint32_t gen_magic; // Generator's magic number -}; - -#endif // SHADER_IL_H -- cgit v1.2.3