summaryrefslogtreecommitdiff
path: root/src/mesa/main/teximage.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/main/teximage.h')
-rw-r--r--src/mesa/main/teximage.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index 585c95f0020..a3baa5f3044 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -1,21 +1,21 @@
-/* $Id: teximage.h,v 1.14 2000/10/16 23:43:12 brianp Exp $ */
+/* $Id: teximage.h,v 1.15 2000/11/22 07:32:17 joukj Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
- *
+ *
* Copyright (C) 1999-2000 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
@@ -29,7 +29,7 @@
#define TEXIMAGE_H
-#include "types.h"
+#include "mtypes.h"
/*** Internal functions ***/
@@ -143,7 +143,7 @@ _mesa_CopyTexImage2D( GLenum target, GLint level,
extern void
-_mesa_CopyTexSubImage1D( GLenum target, GLint level, GLint xoffset,
+_mesa_CopyTexSubImage1D( GLenum target, GLint level, GLint xoffset,
GLint x, GLint y, GLsizei width );
@@ -153,7 +153,7 @@ _mesa_CopyTexSubImage2D( GLenum target, GLint level,
GLint x, GLint y, GLsizei width, GLsizei height );
-extern void
+extern void
_mesa_CopyTexSubImage3D( GLenum target, GLint level,
GLint xoffset, GLint yoffset, GLint zoffset,
GLint x, GLint y, GLsizei width, GLsizei height );