nir: Take a nir_shader and variable mode in assign_var_locations

[mesa.git] / src / mesa / math / m_debug_xform.c

diff --git a/src/mesa/math/m_debug_xform.c b/src/mesa/math/m_debug_xform.c
index feed539eacb8ffb08403425df29d587739b6c052..4795df286d655e7ced269bd348a0c0c4b7c45175 100644 (file)
--- a/src/mesa/math/m_debug_xform.c
+++ b/src/mesa/math/m_debug_xform.c
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
  *
  * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
@@ -17,19 +16,19 @@
  * 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
- * BRIAN PAUL 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.
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
  */
 
 /*
  * Updated for P6 architecture by Gareth Hughes.
  */
 
-#include "glheader.h"
-#include "context.h"
-#include "macros.h"
-#include "imports.h"
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/macros.h"
 
 #include "m_matrix.h"
 #include "m_xform.h"
@@ -42,7 +41,7 @@
 static char dummy;
 #endif
 
-#ifdef DEBUG  /* This code only used for debugging */
+#ifdef DEBUG_MATH  /* This code only used for debugging */
 
 
 /* Overhead of profiling counter in cycles.  Automatically adjusted to
@@ -183,11 +182,11 @@ static int test_transform_function( transform_func func, int psize,
       return 0;
    }
 
-   mat->m = (GLfloat *) ALIGN_MALLOC( 16 * sizeof(GLfloat), 16 );
+   mat->m = align_malloc( 16 * sizeof(GLfloat), 16 );
    mat->type = mtypes[mtype];
 
    m = mat->m;
-   ASSERT( ((long)m & 15) == 0 );
+   assert( ((long)m & 15) == 0 );
 
    init_matrix( m );
 
@@ -206,7 +205,8 @@ static int test_transform_function( transform_func func, int psize,
          case VAR:
             break;
          default:
-            abort();
+            assert(0);
+            return 0;
          }
       }
    }
@@ -253,18 +253,18 @@ static int test_transform_function( transform_func func, int psize,
    for ( i = 0 ; i < TEST_COUNT ; i++ ) {
       for ( j = 0 ; j < 4 ; j++ ) {
          if ( significand_match( d[i][j], r[i][j] ) < REQUIRED_PRECISION ) {
-            _mesa_printf("-----------------------------\n" );
-            _mesa_printf("(i = %i, j = %i)\n", i, j );
-            _mesa_printf("%f \t %f \t [diff = %e - %i bit missed]\n",
+            printf("-----------------------------\n" );
+            printf("(i = %i, j = %i)\n", i, j );
+            printf("%f \t %f \t [diff = %e - %i bit missed]\n",
                    d[i][0], r[i][0], r[i][0]-d[i][0],
                    MAX_PRECISION - significand_match( d[i][0], r[i][0] ) );
-            _mesa_printf("%f \t %f \t [diff = %e - %i bit missed]\n",
+            printf("%f \t %f \t [diff = %e - %i bit missed]\n",
                    d[i][1], r[i][1], r[i][1]-d[i][1],
                    MAX_PRECISION - significand_match( d[i][1], r[i][1] ) );
-            _mesa_printf("%f \t %f \t [diff = %e - %i bit missed]\n",
+            printf("%f \t %f \t [diff = %e - %i bit missed]\n",
                    d[i][2], r[i][2], r[i][2]-d[i][2],
                    MAX_PRECISION - significand_match( d[i][2], r[i][2] ) );
-            _mesa_printf("%f \t %f \t [diff = %e - %i bit missed]\n",
+            printf("%f \t %f \t [diff = %e - %i bit missed]\n",
                    d[i][3], r[i][3], r[i][3]-d[i][3],
                    MAX_PRECISION - significand_match( d[i][3], r[i][3] ) );
             return 0;
@@ -272,7 +272,7 @@ static int test_transform_function( transform_func func, int psize,
       }
    }
 
-   ALIGN_FREE( mat->m );
+   align_free( mat->m );
    return 1;
 }
 
@@ -284,26 +284,26 @@ void _math_test_all_transform_functions( char *description )
 
    if ( first_time ) {
       first_time = 0;
-      mesa_profile = _mesa_getenv( "MESA_PROFILE" );
+      mesa_profile = getenv( "MESA_PROFILE" );
    }
 
 #ifdef RUN_DEBUG_BENCHMARK
    if ( mesa_profile ) {
       if ( !counter_overhead ) {
         INIT_COUNTER();
-        _mesa_printf("counter overhead: %lu cycles\n\n", counter_overhead );
+        printf("counter overhead: %lu cycles\n\n", counter_overhead );
       }
-      _mesa_printf("transform results after hooking in %s functions:\n", description );
+      printf("transform results after hooking in %s functions:\n", description );
    }
 #endif
 
 #ifdef RUN_DEBUG_BENCHMARK
    if ( mesa_profile ) {
-      _mesa_printf("\n" );
+      printf("\n" );
       for ( psize = 1 ; psize <= 4 ; psize++ ) {
-        _mesa_printf(" p%d\t", psize );
+        printf(" p%d\t", psize );
       }
-      _mesa_printf("\n--------------------------------------------------------\n" );
+      printf("\n--------------------------------------------------------\n" );
    }
 #endif
 
@@ -314,25 +314,25 @@ void _math_test_all_transform_functions( char *description )
 
         if ( test_transform_function( func, psize, mtype, cycles ) == 0 ) {
            char buf[100];
-           _mesa_sprintf(buf, "_mesa_transform_tab[0][%d][%s] failed test (%s)",
-                    psize, mstrings[mtype], description );
-           _mesa_problem( NULL, buf );
+           sprintf(buf, "_mesa_transform_tab[0][%d][%s] failed test (%s)",
+                   psize, mstrings[mtype], description );
+           _mesa_problem( NULL, "%s", buf );
         }
 #ifdef RUN_DEBUG_BENCHMARK
         if ( mesa_profile )
-           _mesa_printf(" %li\t", benchmark_tab[psize-1][mtype] );
+           printf(" %li\t", benchmark_tab[psize-1][mtype] );
 #endif
       }
 #ifdef RUN_DEBUG_BENCHMARK
       if ( mesa_profile )
-        _mesa_printf(" | [%s]\n", mstrings[mtype] );
+        printf(" | [%s]\n", mstrings[mtype] );
 #endif
    }
 #ifdef RUN_DEBUG_BENCHMARK
    if ( mesa_profile )
-      _mesa_printf( "\n" );
+      printf( "\n" );
 #endif
 }
 
 
-#endif /* DEBUG */
+#endif /* DEBUG_MATH */