gallium: move print_channels to u_format_table.py

There's no poin t in keeping u_format_pack.py around just to declare
this one function. Let's move it into where it's used.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

src/gallium/auxiliary/Makefile.am

@@ -65,13 +65,12 @@ libgallium_la_SOURCES = \
 	os/os_misc.h \
 	os/os_thread.h
 
-util/u_format_table.c: $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format_pack.py $(srcdir)/util/u_format_parse.py $(srcdir)/util/u_format.csv
+util/u_format_table.c: $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format_parse.py $(srcdir)/util/u_format.csv
 	$(AM_V_at)$(MKDIR_P) util
 	$(AM_V_GEN) $(PYTHON) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@
 
 -include $(top_srcdir)/git.mk
 
 EXTRA_DIST = util/u_format_table.py \
-             util/u_format_pack.py \
              util/u_format_parse.py \
              util/u_format.csv

src/gallium/auxiliary/util/u_format_pack.py

@@ -1,52 +0,0 @@
-#!/usr/bin/env python
-
-'''
-/**************************************************************************
- *
- * Copyright 2009-2010 VMware, Inc.
- * 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, sub license, 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 (including the
- * next paragraph) 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 NON-INFRINGEMENT.
- * IN NO EVENT SHALL VMWARE AND/OR ITS SUPPLIERS 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.
- *
- **************************************************************************/
-
-/**
- * @file
- * Pixel format packing and unpacking functions.
- *
- * @author Jose Fonseca <jfonseca@vmware.com>
- */
-'''
-from __future__ import print_function
-
-
-from u_format_parse import *
-
-
-def print_channels(format, func):
-    if format.nr_channels() <= 1:
-        func(format.le_channels, format.le_swizzles)
-    else:
-        print('#ifdef PIPE_ARCH_BIG_ENDIAN')
-        func(format.be_channels, format.be_swizzles)
-        print('#else')
-        func(format.le_channels, format.le_swizzles)
-        print('#endif')

src/gallium/auxiliary/util/u_format_table.py

@@ -34,7 +34,6 @@ CopyRight = '''
 import sys
 
 from u_format_parse import *
-import u_format_pack
 
 
 def layout_map(layout):
@@ -121,6 +120,16 @@ def write_format_table(formats):
             print("      %s%s\t/* %s */" % (swizzle_map[swizzle], sep, comment))
         print("   },")
 
+    def print_channels(format, func):
+        if format.nr_channels() <= 1:
+            func(format.le_channels, format.le_swizzles)
+        else:
+            print('#ifdef PIPE_ARCH_BIG_ENDIAN')
+            func(format.be_channels, format.be_swizzles)
+            print('#else')
+            func(format.le_channels, format.le_swizzles)
+            print('#endif')
+
     for format in formats:
         print('const struct util_format_description')
         print('util_format_%s_description = {' % (format.short_name(),))
@@ -133,8 +142,8 @@ def write_format_table(formats):
         print("   %s,\t/* is_array */" % (bool_map(format.is_array()),))
         print("   %s,\t/* is_bitmask */" % (bool_map(format.is_bitmask()),))
         print("   %s,\t/* is_mixed */" % (bool_map(format.is_mixed()),))
-        u_format_pack.print_channels(format, do_channel_array)
+        print_channels(format, do_channel_array)
-        u_format_pack.print_channels(format, do_swizzle_array)
+        print_channels(format, do_swizzle_array)
         print("   %s," % (colorspace_map(format.colorspace),))
         print("};")
         print()