Move mesa_to_tgsi.[ch] to state_tracker

diff --git a/src/mesa/sources b/src/mesa/sources
index 6d1ba9b9bdc4fada6504372e1c5266feb02f2619..30d3c32b8360248f1f6a52daf3cd07ff9c9e65f6 100644 (file)
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -186,8 +186,6 @@ TGSIEXEC_SOURCES = \
 TGSIDECO_SOURCES = \
        pipe/tgsi/deco/deco_caps.c
 
-TGSIMESA_SOURCES = \
-       pipe/tgsi/mesa/mesa_to_tgsi.c
 
 ifeq ($(MESA_LLVM),1)
   LLVMTGSI_SOURCES = \
@@ -235,6 +233,7 @@ STATETRACKER_SOURCES = \
        state_tracker/st_debug.c \
        state_tracker/st_draw.c \
        state_tracker/st_format.c \
+       state_tracker/st_mesa_to_tgsi.c \
        state_tracker/st_program.c \
        state_tracker/st_mipmap_tree.c
 
@@ -389,7 +388,6 @@ SOLO_SOURCES = \
        $(DRAW_SOURCES)         \
        $(TGSIEXEC_SOURCES)     \
        $(TGSIDECO_SOURCES)     \
-       $(TGSIMESA_SOURCES)     \
        $(STATECACHE_SOURCES)   \
        $(STATETRACKER_SOURCES) \
        $(TNL_SOURCES)          \

diff --git a/src/mesa/state_tracker/st_atom_shader.c b/src/mesa/state_tracker/st_atom_shader.c
index 919461bcb8b3336460aee7495e181bd635e327b2..92ca22851edb89fe57d565b7b59fee47bd812d35 100644 (file)
--- a/src/mesa/state_tracker/st_atom_shader.c
+++ b/src/mesa/state_tracker/st_atom_shader.c
@@ -41,7 +41,6 @@
 #include "main/mtypes.h"
 
 #include "pipe/p_context.h"
-#include "pipe/tgsi/mesa/mesa_to_tgsi.h"
 #include "pipe/tgsi/exec/tgsi_core.h"
 
 #include "st_context.h"
@@ -49,6 +48,7 @@
 #include "st_atom.h"
 #include "st_program.h"
 #include "st_atom_shader.h"
+#include "st_mesa_to_tgsi.h"
 
 
 /**

diff --git a/src/mesa/state_tracker/st_cb_clear.c b/src/mesa/state_tracker/st_cb_clear.c
index 30672e0dd43b5761c760a4809300cdce1cb0a926..2c79e2890d136d6be72b51c1f2ffef251a82baca 100644 (file)
--- a/src/mesa/state_tracker/st_cb_clear.c
+++ b/src/mesa/state_tracker/st_cb_clear.c
@@ -43,13 +43,13 @@
 #include "st_draw.h"
 #include "st_program.h"
 #include "st_public.h"
+#include "st_mesa_to_tgsi.h"
 
 #include "pipe/p_context.h"
 #include "pipe/p_state.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
 
-#include "pipe/tgsi/mesa/mesa_to_tgsi.h"
 
 
 

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 5d8890e02251dbb2564cf1ef21198a2a87afa59e..896ba2b905e3469e80d86e2766a9853c4ceca2fa 100644 (file)
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -45,10 +45,10 @@
 #include "st_cb_texture.h"
 #include "st_draw.h"
 #include "st_format.h"
+#include "st_mesa_to_tgsi.h"
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_winsys.h"
-#include "pipe/tgsi/mesa/mesa_to_tgsi.h"
 #include "shader/prog_instruction.h"
 
 

diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c
index 26609e964545995a430e4cf72b7d85da21a52eea..a330c1c92276c81e2c4458869fbfb8248d50ce40 100644 (file)
--- a/src/mesa/state_tracker/st_cb_program.c
+++ b/src/mesa/state_tracker/st_cb_program.c
@@ -43,7 +43,6 @@
 #include "st_program.h"
 #include "st_atom_shader.h"
 
-#include "pipe/tgsi/mesa/tgsi_mesa.h"
 
 
 /**

diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 2c33f26d4803512b64d7d92d0d0422012dc89abe..131e50becea23227ba727eea880be81cd8481f7f 100644 (file)
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -1,6 +1,39 @@
+/**************************************************************************\r
+ * \r
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.\r
+ * All Rights Reserved.\r
+ * \r
+ * Permission is hereby granted, free of charge, to any person obtaining a\r
+ * copy of this software and associated documentation files (the\r
+ * "Software"), to deal in the Software without restriction, including\r
+ * without limitation the rights to use, copy, modify, merge, publish,\r
+ * distribute, sub license, and/or sell copies of the Software, and to\r
+ * permit persons to whom the Software is furnished to do so, subject to\r
+ * the following conditions:\r
+ * \r
+ * The above copyright notice and this permission notice (including the\r
+ * next paragraph) shall be included in all copies or substantial portions\r
+ * of the Software.\r
+ * \r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS\r
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\r
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR\r
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\r
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\r
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+ * \r
+ **************************************************************************/\r
+\r
+/*\r
+ * \author\r
+ * Michal Krol\r
+ */\r
+\r
+\r
 #include "tgsi_platform.h"\r
-#include "tgsi_mesa.h"\r
-#include "pipe/tgsi/mesa/mesa_to_tgsi.h"\r
+#include "pipe/tgsi/exec/tgsi_core.h"\r
+#include "st_mesa_to_tgsi.h"\r
 #include "shader/prog_parameter.h"\r
 \r
 #define TGSI_DEBUG 0\r

diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.h b/src/mesa/state_tracker/st_mesa_to_tgsi.h
index 13372d75fd318c9e5864d3394f695e5d9fa1c14a..941a75ab05846aa316c18b187dada64fc7b382d8 100644 (file)
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.h
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.h
@@ -1,9 +1,37 @@
-#if !defined MESA_TO_TGSI_H\r
-#define MESA_TO_TGSI_H\r
+/**************************************************************************\r
+ * \r
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.\r
+ * All Rights Reserved.\r
+ * \r
+ * Permission is hereby granted, free of charge, to any person obtaining a\r
+ * copy of this software and associated documentation files (the\r
+ * "Software"), to deal in the Software without restriction, including\r
+ * without limitation the rights to use, copy, modify, merge, publish,\r
+ * distribute, sub license, and/or sell copies of the Software, and to\r
+ * permit persons to whom the Software is furnished to do so, subject to\r
+ * the following conditions:\r
+ * \r
+ * The above copyright notice and this permission notice (including the\r
+ * next paragraph) shall be included in all copies or substantial portions\r
+ * of the Software.\r
+ * \r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS\r
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.\r
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR\r
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\r
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\r
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+ * \r
+ **************************************************************************/\r
+\r
+\r
+#ifndef ST_MESA_TO_TGSI_H\r
+#define ST_MESA_TO_TGSI_H\r
 \r
 #if defined __cplusplus\r
 extern "C" {\r
-#endif // defined __cplusplus\r
+#endif\r
 \r
 struct tgsi_token;\r
 \r
@@ -25,8 +53,8 @@ tgsi_translate_mesa_program(
 \r
 \r
 #if defined __cplusplus\r
-} // extern "C"\r
-#endif // defined __cplusplus\r
+} /* extern "C" */\r
+#endif\r
 \r
-#endif // !defined MESA_TO_TGSI_H\r
+#endif /* ST_MESA_TO_TGSI_H */\r
 \r

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 9fc0798ec5870d4f3295da2fce555a766e2c751a..8c61815b9b65f4cbee55686ed595ddaf9d4155ab 100644 (file)
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -37,7 +37,6 @@
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
 #include "pipe/draw/draw_context.h"
-#include "pipe/tgsi/mesa/mesa_to_tgsi.h"
 #include "pipe/tgsi/exec/tgsi_core.h"
 #include "pipe/llvm/llvmtgsi.h"
 
@@ -45,6 +44,7 @@
 #include "st_cache.h"
 #include "st_atom.h"
 #include "st_program.h"
+#include "st_mesa_to_tgsi.h"
 
 
 #define TGSI_DEBUG 0