From 00bca06d233820ef64272c2e4af135660f65cc9e Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 4 Nov 2010 19:36:10 +0100 Subject: Replaced with khronos 1.0.3 version --- make/stub_includes/egl/KD/kd.h | 37 ++++------------------ make/stub_includes/egl/KD/kdplatform.h | 58 ++++------------------------------ 2 files changed, 13 insertions(+), 82 deletions(-) (limited to 'make') diff --git a/make/stub_includes/egl/KD/kd.h b/make/stub_includes/egl/KD/kd.h index c82385b86..e2353eeb6 100644 --- a/make/stub_includes/egl/KD/kd.h +++ b/make/stub_includes/egl/KD/kd.h @@ -1,26 +1,4 @@ -/* -* Copyright (c) 2007 The Khronos Group 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. -* -*/ - +/* Reference KD/kd.h for OpenKODE Core 1.0.3 */ #ifndef __kd_h_ #define __kd_h_ @@ -106,7 +84,6 @@ typedef KDuint32 KDmode; #define KD_EOPNOTSUPP 31 #define KD_EOVERFLOW 32 #define KD_EPERM 33 -#define KD_EPIPE 34 #define KD_ERANGE 35 #define KD_ETIMEDOUT (36) #define KD_ETRY_AGAIN 37 @@ -309,7 +286,7 @@ KD_API void KD_APIENTRY kdFreeEvent(KDEvent *event); *******************************************************/ /* kdMain: The application-defined main function. */ -KD_API KDint KD_APIENTRY kdMain(KDint argc, const KDchar *const *argv); +KDint KD_APIENTRY kdMain(KDint argc, const KDchar *const *argv); /* kdExit: Exit the application. */ KD_API KD_NORETURN void KD_APIENTRY kdExit(KDint status); @@ -577,8 +554,8 @@ KD_API void KD_APIENTRY kdClearerr(KDFile *file); /* kdFseek: Reposition the file position indicator in a file. */ typedef enum { - KD_SEEK_SET = 0, - KD_SEEK_CUR = 1, + KD_SEEK_SET = 0, + KD_SEEK_CUR = 1, KD_SEEK_END = 2 } KDfileSeekOrigin; KD_API KDint KD_APIENTRY kdFseek(KDFile *file, KDoff offset, KDfileSeekOrigin origin); @@ -707,7 +684,7 @@ KD_API KDint KD_APIENTRY kdInetAton(const KDchar *cp, KDuint32 *inp); /* kdInetNtop: Convert a network address to textual form. */ #define KD_INET_ADDRSTRLEN 16 typedef struct KDInAddr { - KDuint32 _s_addr; /* MSVC VC9 again .. couldn't handle s_addr here */ + KDuint32 s_addr; } KDInAddr; KD_API const KDchar *KD_APIENTRY kdInetNtop(KDuint af, const void *src, KDchar *dst, KDsize cnt); @@ -751,7 +728,7 @@ typedef struct KDEventNameLookup { /* KD_EVENT_STATE: State changed event. */ #define KD_EVENT_STATE 55 - + typedef struct KDEventState { KDint32 index; union { @@ -763,7 +740,7 @@ typedef struct KDEventState { /* KD_EVENT_INPUT: Input changed event. */ #define KD_EVENT_INPUT 56 - + typedef struct KDEventInput { KDint32 index; union { diff --git a/make/stub_includes/egl/KD/kdplatform.h b/make/stub_includes/egl/KD/kdplatform.h index 5e3ebebdf..cabcd3ce5 100644 --- a/make/stub_includes/egl/KD/kdplatform.h +++ b/make/stub_includes/egl/KD/kdplatform.h @@ -1,39 +1,4 @@ -/* - * Copyright (c) 2007 NVIDIA Corporation. All rights reserved. - * - * NVIDIA Corporation and its licensors retain all intellectual property - * and proprietary rights in and to this software, related documentation - * and any modifications thereto. Any use, reproduction, disclosure or - * distribution of this software and related documentation without an express - * license agreement from NVIDIA Corporation is strictly prohibited. - */ - -/* -* Copyright (c) 2007 The Khronos Group 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. -* -*/ - - -/* NVIDIA KD/kdplatform.h for OpenKODE Core 1.0 Final candidate (draft 5070) */ - +/* Sample KD/kdplatform.h for OpenKODE Core 1.0.3 */ #ifndef __kdplatform_h_ #define __kdplatform_h_ @@ -42,13 +7,8 @@ typedef int KDint32; typedef unsigned int KDuint32; -#if defined(_MSC_VER) -typedef signed __int64 KDint64; -typedef unsigned __int64 KDuint64; -#else typedef long long KDint64; typedef unsigned long long KDuint64; -#endif typedef short KDint16; typedef unsigned short KDuint16; typedef unsigned long KDuintptr; @@ -60,11 +20,12 @@ typedef long KDssize; #define KDINT64_MIN (-0x7fffffffffffffffLL-1) #define KDINT64_MAX 0x7fffffffffffffffLL #define KDUINT64_MAX 0xffffffffffffffffULL -#define KDSIZE_MAX (~(unsigned long)0) -#define KDSSIZE_MAX ((long)KDSIZE_MAX/2) -#define KDSSIZE_MIN (-1 - KDSSIZE_MAX) -#define KDUINTPTR_MAX KDSIZE_MAX +#define KDSSIZE_MIN (-0x7fffffff-1) +#define KDSSIZE_MAX 0x7fffffff +#define KDSIZE_MAX 0xffffffffU +#define KDUINTPTR_MAX 0xffffffffU #define KD_NORETURN +#define KD_INFINITY (1.0F/0.0F) #define KD_WINDOW_SUPPORTED #ifdef KD_NDEBUG #define kdAssert(c) @@ -72,12 +33,5 @@ typedef long KDssize; #define kdAssert(c) ((void)( (c) ? 0 : (kdHandleAssertion(#c, __FILE__, __LINE__), 0))) #endif -#define KD_INFINITY_BITS 0x7f800000u -#define KD_NEGATIVE_ZERO_BITS 0x80000000u -#define KD_INFINITY (kdBitsToFloatNV(KD_INFINITY_BITS)) -#define KD_NEGATIVE_ZERO (kdBitsToFloatNV(KD_NEGATIVE_ZERO_BITS)) - -KD_API float KD_APIENTRY kdBitsToFloatNV(KDuint32 x); - #endif /* __kdplatform_h_ */ -- cgit v1.2.3