From 5eb7ff1175a644ffe3b0f1a75cb235400355f9fb Mon Sep 17 00:00:00 2001 From: Johannes Obermayr Date: Tue, 20 Aug 2013 20:14:00 +0200 Subject: Move nv30, nv50 and nvc0 to nouveau. It is planned to ship openSUSE 13.1 with -shared libs. nouveau.la, nv30.la, nv50.la and nvc0.la are currently LIBADDs in all nouveau related targets. This change makes it possible to easily build one shared libnouveau.so which is then LIBADDed. Also dlopen will be faster for one library instead of three and build time on -jX will be reduced. Whitespace fixes were requested by 'git am'. Signed-off-by: Johannes Obermayr Acked-by: Christoph Bumiller Acked-by: Ian Romanick --- src/gallium/drivers/nvc0/nvc0_3ddefs.xml.h | 98 ------------------------------ 1 file changed, 98 deletions(-) delete mode 100644 src/gallium/drivers/nvc0/nvc0_3ddefs.xml.h (limited to 'src/gallium/drivers/nvc0/nvc0_3ddefs.xml.h') diff --git a/src/gallium/drivers/nvc0/nvc0_3ddefs.xml.h b/src/gallium/drivers/nvc0/nvc0_3ddefs.xml.h deleted file mode 100644 index 84b152213a2..00000000000 --- a/src/gallium/drivers/nvc0/nvc0_3ddefs.xml.h +++ /dev/null @@ -1,98 +0,0 @@ -#ifndef NV_3DDEFS_XML -#define NV_3DDEFS_XML - -/* Autogenerated file, DO NOT EDIT manually! - -This file was generated by the rules-ng-ng headergen tool in this git repository: -http://0x04.net/cgit/index.cgi/rules-ng-ng -git clone git://0x04.net/rules-ng-ng - -The rules-ng-ng source files this header was generated from are: -- nvc0_3d.xml ( 26312 bytes, from 2010-10-08 10:10:01) -- copyright.xml ( 6498 bytes, from 2010-10-03 13:18:37) -- nv_defs.xml ( 4437 bytes, from 2010-07-06 07:43:58) -- nv_3ddefs.xml ( 16397 bytes, from 2010-10-08 13:30:38) -- nv_object.xml ( 11249 bytes, from 2010-10-07 15:31:28) -- nvchipsets.xml ( 2824 bytes, from 2010-07-07 13:41:20) -- nv50_defs.xml ( 4482 bytes, from 2010-10-03 13:18:37) - -Copyright (C) 2006-2010 by the following authors: -- Artur Huillet (ahuillet) -- Ben Skeggs (darktama, darktama_) -- B. R. (koala_br) -- Carlos Martin (carlosmn) -- Christoph Bumiller (calim, chrisbmr) -- Dawid Gajownik (gajownik) -- Dmitry Baryshkov -- Dmitry Eremin-Solenikov (lumag) -- EdB (edb_) -- Erik Waling (erikwaling) -- Francisco Jerez (curro, curro_, currojerez) -- imirkin (imirkin) -- jb17bsome (jb17bsome) -- Jeremy Kolb (kjeremy) -- Laurent Carlier (lordheavy) -- Luca Barbieri (lb, lb1) -- Maarten Maathuis (stillunknown) -- Marcin Kościelnicki (mwk, koriakin) -- Mark Carey (careym) -- Matthieu Castet (mat-c) -- nvidiaman (nvidiaman) -- Patrice Mandin (pmandin, pmdata) -- Pekka Paalanen (pq, ppaalanen) -- Peter Popov (ironpeter) -- Richard Hughes (hughsient) -- Rudi Cilibrasi (cilibrar) -- Serge Martin -- Simon Raffeiner -- Stephane Loeuillet (leroutier) -- Stephane Marchesin (marcheu) -- sturmflut (sturmflut) -- Sylvain Munaut -- Victor Stinner (haypo) -- Wladmir van der Laan (miathan6) -- Younes Manton (ymanton) - -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 (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 NONINFRINGEMENT. -IN NO EVENT SHALL THE COPYRIGHT OWNER(S) 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. -*/ - - -#define NV50_3D_BLEND_FACTOR_ZERO 0x00004000 -#define NV50_3D_BLEND_FACTOR_ONE 0x00004001 -#define NV50_3D_BLEND_FACTOR_SRC_COLOR 0x00004300 -#define NV50_3D_BLEND_FACTOR_ONE_MINUS_SRC_COLOR 0x00004301 -#define NV50_3D_BLEND_FACTOR_SRC_ALPHA 0x00004302 -#define NV50_3D_BLEND_FACTOR_ONE_MINUS_SRC_ALPHA 0x00004303 -#define NV50_3D_BLEND_FACTOR_DST_ALPHA 0x00004304 -#define NV50_3D_BLEND_FACTOR_ONE_MINUS_DST_ALPHA 0x00004305 -#define NV50_3D_BLEND_FACTOR_DST_COLOR 0x00004306 -#define NV50_3D_BLEND_FACTOR_ONE_MINUS_DST_COLOR 0x00004307 -#define NV50_3D_BLEND_FACTOR_SRC_ALPHA_SATURATE 0x00004308 -#define NV50_3D_BLEND_FACTOR_CONSTANT_COLOR 0x0000c001 -#define NV50_3D_BLEND_FACTOR_ONE_MINUS_CONSTANT_COLOR 0x0000c002 -#define NV50_3D_BLEND_FACTOR_CONSTANT_ALPHA 0x0000c003 -#define NV50_3D_BLEND_FACTOR_ONE_MINUS_CONSTANT_ALPHA 0x0000c004 -#define NV50_3D_BLEND_FACTOR_SRC1_COLOR 0x0000c900 -#define NV50_3D_BLEND_FACTOR_ONE_MINUS_SRC1_COLOR 0x0000c901 -#define NV50_3D_BLEND_FACTOR_SRC1_ALPHA 0x0000c902 -#define NV50_3D_BLEND_FACTOR_ONE_MINUS_SRC1_ALPHA 0x0000c903 - -#endif /* NV_3DDEFS_XML */ -- cgit v1.2.3