From c1a9e6010baceeff78f72ac0692aefc4312d815f Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Tue, 21 Aug 2012 20:22:27 -0600
Subject: [PATCH] mesa: rename texpal.[ch] to texcompress_cpal.[ch]

To be consistent with other files related to texture compression.
---
 src/mesa/SConscript                            |  2 +-
 src/mesa/main/{texpal.c => texcompress_cpal.c} | 25 ++++++++++++++++++++-----
 src/mesa/main/{texpal.h => texcompress_cpal.h} |  6 +++---
 src/mesa/main/teximage.c                       |  2 +-
 src/mesa/sources.mak                           |  2 +-
 5 files changed, 26 insertions(+), 11 deletions(-)
 rename src/mesa/main/{texpal.c => texcompress_cpal.c} (84%)
 rename src/mesa/main/{texpal.h => texcompress_cpal.h} (94%)

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 1b98b04c152..938eea5d606 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -116,6 +116,7 @@ main_sources = [
     'main/stencil.c',
     'main/syncobj.c',
     'main/texcompress.c',
+    'main/texcompress_cpal.c',
     'main/texcompress_rgtc.c',
     'main/texcompress_s3tc.c',
     'main/texcompress_fxt1.c',
@@ -126,7 +127,6 @@ main_sources = [
     'main/texgetimage.c',
     'main/teximage.c',
     'main/texobj.c',
-    'main/texpal.c',
     'main/texparam.c',
     'main/texstate.c',
     'main/texstorage.c',
diff --git a/src/mesa/main/texpal.c b/src/mesa/main/texcompress_cpal.c
similarity index 84%
rename from src/mesa/main/texpal.c
rename to src/mesa/main/texcompress_cpal.c
index ed2261b01cb..2398ded69f4 100644
--- a/src/mesa/main/texpal.c
+++ b/src/mesa/main/texcompress_cpal.c
@@ -1,10 +1,25 @@
-/**************************************************************************
+/*
+ * Mesa 3-D graphics library
  *
  * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
- * 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
+ * THE AUTHORS 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.
+ */
 
 /**
  * Code to convert compressed/paletted texture images to ordinary images.
@@ -22,8 +37,8 @@
 #include "mtypes.h"
 #include "imports.h"
 #include "pixelstore.h"
+#include "texcompress_cpal.h"
 #include "teximage.h"
-#include "texpal.h"
 
 #if FEATURE_ES
 
diff --git a/src/mesa/main/texpal.h b/src/mesa/main/texcompress_cpal.h
similarity index 94%
rename from src/mesa/main/texpal.h
rename to src/mesa/main/texcompress_cpal.h
index acfaa313ec5..7507d5c1b65 100644
--- a/src/mesa/main/texpal.h
+++ b/src/mesa/main/texcompress_cpal.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef TEXPAL_H
-#define TEXPAL_H
+#ifndef TEXCOMPRESS_CPAL_H
+#define TEXCOMPRESS_CPAL_H
 
 
 #include "main/glheader.h"
@@ -42,4 +42,4 @@ extern void
 _mesa_cpal_compressed_format_type(GLenum internalFormat, GLenum *format,
 				  GLenum *type);
 
-#endif /* TEXPAL_H */
+#endif /* TEXCOMPRESS_CPAL_H */
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index eff6fb7c6e8..be01fb9c4e1 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -42,10 +42,10 @@
 #include "mfeatures.h"
 #include "state.h"
 #include "texcompress.h"
+#include "texcompress_cpal.h"
 #include "teximage.h"
 #include "texobj.h"
 #include "texstate.h"
-#include "texpal.h"
 #include "mtypes.h"
 #include "glformats.h"
 
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index ee260cbfd8f..dedeed998b1 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -85,6 +85,7 @@ MAIN_FILES = \
 	$(SRCDIR)main/stencil.c \
 	$(SRCDIR)main/syncobj.c \
 	$(SRCDIR)main/texcompress.c \
+	$(SRCDIR)main/texcompress_cpal.c \
 	$(SRCDIR)main/texcompress_rgtc.c \
 	$(SRCDIR)main/texcompress_s3tc.c \
 	$(SRCDIR)main/texcompress_fxt1.c \
@@ -95,7 +96,6 @@ MAIN_FILES = \
 	$(SRCDIR)main/texgetimage.c \
 	$(SRCDIR)main/teximage.c \
 	$(SRCDIR)main/texobj.c \
-	$(SRCDIR)main/texpal.c \
 	$(SRCDIR)main/texparam.c \
 	$(SRCDIR)main/texstate.c \
 	$(SRCDIR)main/texstorage.c \
-- 
2.11.0