mesa: rename texformat_tmp.h to texfetch_tmp.h

diff --git a/src/mesa/main/texfetch.c b/src/mesa/main/texfetch.c
index 3cc424f..62a8b53 100644 (file)
--- a/src/mesa/main/texfetch.c
+++ b/src/mesa/main/texfetch.c
@@ -77,13 +77,13 @@ nonlinear_to_linear(GLubyte cs8)
 /* Texel fetch routines for all supported formats
  */
 #define DIM 1
-#include "texformat_tmp.h"
+#include "texfetch_tmp.h"
 
 #define DIM 2
-#include "texformat_tmp.h"
+#include "texfetch_tmp.h"
 
 #define DIM 3
-#include "texformat_tmp.h"
+#include "texfetch_tmp.h"
 
 /**
  * Null texel fetch function.

diff --git a/src/mesa/main/texformat_tmp.h b/src/mesa/main/texfetch_tmp.h
similarity index 99%
rename from src/mesa/main/texformat_tmp.h
rename to src/mesa/main/texfetch_tmp.h
index 199849d..3ac932b 100644 (file)
--- a/src/mesa/main/texformat_tmp.h
+++ b/src/mesa/main/texfetch_tmp.h
@@ -1,9 +1,9 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.1
+ * Version:  7.7
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
- * Copyright (c) 2008 VMware, Inc.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (c) 2008-2009  VMware, Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -25,18 +25,16 @@
 
 
 /**
- * \file texformat_tmp.h
+ * \file texfetch_tmp.h
  * Texel fetch functions template.
  * 
- * This template file is used by texformat.c to generate texel fetch functions
+ * This template file is used by texfetch.c to generate texel fetch functions
  * for 1-D, 2-D and 3-D texture images. 
  *
  * It should be expanded by defining \p DIM as the number texture dimensions
  * (1, 2 or 3).  According to the value of \p DIM a series of macros is defined
  * for the texel lookup in the gl_texture_image::Data.
  * 
- * \sa texformat.c and FetchTexel.
- * 
  * \author Gareth Hughes
  * \author Brian Paul
  */

diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj
index 9a24acf..100d83d 100644 (file)
--- a/windows/VC7/mesa/mesa/mesa.vcproj
+++ b/windows/VC7/mesa/mesa/mesa.vcproj
@@ -1167,7 +1167,7 @@
                                RelativePath="..\..\..\..\src\mesa\main\texformat.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\main\texformat_tmp.h">\r
+                               RelativePath="..\..\..\..\src\mesa\main\texfetch_tmp.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\main\teximage.h">\r

diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
index ec41314..efc2439 100644 (file)
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/windows/VC8/mesa/mesa/mesa.vcproj
@@ -1888,7 +1888,7 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\main\texformat_tmp.h"\r
+                               RelativePath="..\..\..\..\src\mesa\main\texfetch_tmp.h"\r
                                >\r
                        </File>\r
                        <File\r