Merge remote-tracking branch 'origin/released'

1 files changed, 102 insertions, 102 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_debug.c b/mesalib/src/mesa/state_tracker/st_debug.c
index ee7d78a4f..850fab925 100644
--- a/mesalib/src/mesa/state_tracker/st_debug.c
+++ b/mesalib/src/mesa/state_tracker/st_debug.c
@@ -1,102 +1,102 @@
-/**************************************************************************

- * 

- * Copyright 2007 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, 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 TUNGSTEN GRAPHICS 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.

- * 

- **************************************************************************/

-

-

-#include "main/context.h"

-#include "program/prog_print.h"

-

-#include "pipe/p_state.h"

-#include "pipe/p_shader_tokens.h"

-#include "tgsi/tgsi_dump.h"

-

-#include "cso_cache/cso_cache.h"

-

-#include "st_context.h"

-#include "st_debug.h"

-#include "st_program.h"

-

-

-

-#ifdef DEBUG

-int ST_DEBUG = 0;

-

-static const struct debug_named_value st_debug_flags[] = {

-   { "mesa",     DEBUG_MESA, NULL },

-   { "tgsi",     DEBUG_TGSI, NULL },

-   { "constants",DEBUG_CONSTANTS, NULL },

-   { "pipe",     DEBUG_PIPE, NULL },

-   { "tex",      DEBUG_TEX, NULL },

-   { "fallback", DEBUG_FALLBACK, NULL },

-   { "screen",   DEBUG_SCREEN, NULL },

-   { "query",    DEBUG_QUERY, NULL },

-   DEBUG_NAMED_VALUE_END

-};

-

-DEBUG_GET_ONCE_FLAGS_OPTION(st_debug, "ST_DEBUG", st_debug_flags, 0)

-#endif

-

-

-void

-st_debug_init(void)

-{

-#ifdef DEBUG

-   ST_DEBUG = debug_get_option_st_debug();

-#endif

-}

-

-

-

-/**

- * Print current state.  May be called from inside gdb to see currently

- * bound vertex/fragment shaders and associated constants.

- */

-void

-st_print_current(void)

-{

-   GET_CURRENT_CONTEXT(ctx);

-   struct st_context *st = st_context(ctx);

-

-#if 0

-   int i;

-

-   printf("Vertex Transform Inputs:\n");

-   for (i = 0; i < st->vp->state.num_inputs; i++) {

-      printf("  Slot %d:  VERT_ATTRIB_%d\n", i, st->vp->index_to_input[i]);

-   }

-#endif

-

-   if (st->vp->variants)

-      tgsi_dump( st->vp->variants[0].tgsi.tokens, 0 );

-   if (st->vp->Base.Base.Parameters)

-      _mesa_print_parameter_list(st->vp->Base.Base.Parameters);

-

-   tgsi_dump( st->fp->tgsi.tokens, 0 );

-   if (st->fp->Base.Base.Parameters)

-      _mesa_print_parameter_list(st->fp->Base.Base.Parameters);

-}

-

-

+/**************************************************************************
+ * 
+ * Copyright 2007 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, 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 TUNGSTEN GRAPHICS 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.
+ * 
+ **************************************************************************/
+
+
+#include "main/context.h"
+#include "program/prog_print.h"
+
+#include "pipe/p_state.h"
+#include "pipe/p_shader_tokens.h"
+#include "tgsi/tgsi_dump.h"
+
+#include "cso_cache/cso_cache.h"
+
+#include "st_context.h"
+#include "st_debug.h"
+#include "st_program.h"
+
+
+
+#ifdef DEBUG
+int ST_DEBUG = 0;
+
+static const struct debug_named_value st_debug_flags[] = {
+   { "mesa",     DEBUG_MESA, NULL },
+   { "tgsi",     DEBUG_TGSI, NULL },
+   { "constants",DEBUG_CONSTANTS, NULL },
+   { "pipe",     DEBUG_PIPE, NULL },
+   { "tex",      DEBUG_TEX, NULL },
+   { "fallback", DEBUG_FALLBACK, NULL },
+   { "screen",   DEBUG_SCREEN, NULL },
+   { "query",    DEBUG_QUERY, NULL },
+   DEBUG_NAMED_VALUE_END
+};
+
+DEBUG_GET_ONCE_FLAGS_OPTION(st_debug, "ST_DEBUG", st_debug_flags, 0)
+#endif
+
+
+void
+st_debug_init(void)
+{
+#ifdef DEBUG
+   ST_DEBUG = debug_get_option_st_debug();
+#endif
+}
+
+
+
+/**
+ * Print current state.  May be called from inside gdb to see currently
+ * bound vertex/fragment shaders and associated constants.
+ */
+void
+st_print_current(void)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   struct st_context *st = st_context(ctx);
+
+#if 0
+   int i;
+
+   printf("Vertex Transform Inputs:\n");
+   for (i = 0; i < st->vp->state.num_inputs; i++) {
+      printf("  Slot %d:  VERT_ATTRIB_%d\n", i, st->vp->index_to_input[i]);
+   }
+#endif
+
+   if (st->vp->variants)
+      tgsi_dump( st->vp->variants[0].tgsi.tokens, 0 );
+   if (st->vp->Base.Base.Parameters)
+      _mesa_print_parameter_list(st->vp->Base.Base.Parameters);
+
+   tgsi_dump( st->fp->variants[0].tgsi.tokens, 0 );
+   if (st->fp->Base.Base.Parameters)
+      _mesa_print_parameter_list(st->fp->Base.Base.Parameters);
+}
+
+