X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fcolortab.h;h=b6ff737a65fefe13c8c0f644e75dbaaed7d98c20;hb=989edea40913de9347908488db8978eb2efaba63;hp=8e75f13dac7e5b4a6e67bc8c5f75a8966f55a180;hpb=afb833d4e89c312460a4ab9ed6a7a8ca4ebbfe1c;p=mesa.git

diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h
index 8e75f13dac7..b6ff737a65f 100644
--- a/src/mesa/main/colortab.h
+++ b/src/mesa/main/colortab.h
@@ -1,21 +1,19 @@
-/* $Id: colortab.h,v 1.1 1999/08/19 00:55:41 jtg Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
- * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- * 
+ * Version:  6.5.2
+ *
+ * Copyright (C) 1999-2006  Brian Paul   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"),
  * 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
@@ -25,31 +23,78 @@
  */
 
 
+#ifndef COLORTAB_H
+#define COLORTAB_H
 
 
+#include "mtypes.h"
 
-#ifndef COLORTAB_H
-#define COLORTAB_H
+#if _HAVE_FULL_GL
+
+extern void GLAPIENTRY
+_mesa_ColorTable( GLenum target, GLenum internalformat,
+                  GLsizei width, GLenum format, GLenum type,
+                  const GLvoid *table );
+
+extern void GLAPIENTRY
+_mesa_ColorSubTable( GLenum target, GLsizei start,
+                     GLsizei count, GLenum format, GLenum type,
+                     const GLvoid *table );
+
+extern void GLAPIENTRY
+_mesa_CopyColorSubTable(GLenum target, GLsizei start,
+                        GLint x, GLint y, GLsizei width);
+
+extern void GLAPIENTRY
+_mesa_CopyColorTable(GLenum target, GLenum internalformat,
+                     GLint x, GLint y, GLsizei width);
 
+extern void GLAPIENTRY
+_mesa_GetColorTable( GLenum target, GLenum format,
+                     GLenum type, GLvoid *table );
 
-#include "types.h"
+extern void GLAPIENTRY
+_mesa_ColorTableParameterfv(GLenum target, GLenum pname,
+                            const GLfloat *params);
 
+extern void GLAPIENTRY
+_mesa_ColorTableParameteriv(GLenum target, GLenum pname,
+                            const GLint *params);
 
-extern void gl_ColorTable( GLcontext *ctx, GLenum target,
-                           GLenum internalformat,
-                           struct gl_image *table );
+extern void GLAPIENTRY
+_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params );
 
-extern void gl_ColorSubTable( GLcontext *ctx, GLenum target,
-                              GLsizei start, struct gl_image *data );
+extern void GLAPIENTRY
+_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params );
 
-extern void gl_GetColorTable( GLcontext *ctx, GLenum target, GLenum format,
-                              GLenum type, GLvoid *table );
 
-extern void gl_GetColorTableParameterfv( GLcontext *ctx, GLenum target,
-                                         GLenum pname, GLfloat *params );
 
-extern void gl_GetColorTableParameteriv( GLcontext *ctx, GLenum target,
-                                         GLenum pname, GLint *params );
+extern void
+_mesa_init_colortable( struct gl_color_table *table );
 
+extern void
+_mesa_free_colortable_data( struct gl_color_table *table );
+
+extern void 
+_mesa_init_colortables( GLcontext *ctx );
+
+extern void 
+_mesa_free_colortables_data( GLcontext *ctx );
+
+#else
+
+/** No-op */
+#define _mesa_init_colortable( p ) ((void) 0)
+
+/** No-op */
+#define _mesa_free_colortable_data( p ) ((void) 0)
+
+/** No-op */
+#define _mesa_init_colortables( p ) ((void)0)
+
+/** No-op */
+#define _mesa_free_colortables_data( p ) ((void)0)
+
+#endif
 
 #endif