Merge branch 'pipe-format-simplify'

[mesa.git] / src / gallium / auxiliary / draw / draw_vs_aos_machine.c

diff --git a/src/gallium/auxiliary/draw/draw_vs_aos_machine.c b/src/gallium/auxiliary/draw/draw_vs_aos_machine.c
index dcb6c2c8d4c462685756f6d873696ca59a3ac484..3240e3745ddc1f5d4ca358400e55364001c9c2ef 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_vs_aos_machine.c
+++ b/src/gallium/auxiliary/draw/draw_vs_aos_machine.c
@@ -28,17 +28,19 @@
 
 #include "pipe/p_config.h"
 
-#ifdef PIPE_ARCH_X86
 
-#include "pipe/p_util.h"
 #include "pipe/p_shader_tokens.h"
-#include "tgsi/util/tgsi_parse.h"
-#include "tgsi/util/tgsi_util.h"
-#include "tgsi/exec/tgsi_exec.h"
+#include "util/u_math.h"
+#include "util/u_memory.h"
+#include "tgsi/tgsi_parse.h"
+#include "tgsi/tgsi_util.h"
+#include "tgsi/tgsi_exec.h"
 #include "draw_vs.h"
 #include "draw_vs_aos.h"
 #include "draw_vertex.h"
 
+#ifdef PIPE_ARCH_X86
+
 #include "rtasm/rtasm_x86sse.h"
 
 
@@ -72,7 +74,7 @@ void PIPE_CDECL aos_do_lit( struct aos_machine *machine,
       {
          result[0] = 1.0F;
          result[1] = in[0];
-         result[2] = 1.0;
+         result[2] = 0.0F;
          result[3] = 1.0F;
       }
       else
@@ -106,7 +108,7 @@ static void PIPE_CDECL do_lit_lut( struct aos_machine *machine,
       {
          result[0] = 1.0F;
          result[1] = in[0];
-         result[2] = 1.0;
+         result[2] = 0.0F;
          result[3] = 1.0F;
          return;
       }
@@ -298,6 +300,25 @@ struct aos_machine *draw_vs_aos_machine( void )
    return machine;
 }
 
+#else
+
+void draw_vs_aos_machine_viewport( struct aos_machine *machine,
+                                   const struct pipe_viewport_state *viewport )
+{
+}
+
+void draw_vs_aos_machine_constants( struct aos_machine *machine,
+                                    const float (*constants)[4] )
+{
+}
+
+void draw_vs_aos_machine_destroy( struct aos_machine *machine )
+{
+}
 
+struct aos_machine *draw_vs_aos_machine( void )
+{
+   return NULL;
+}
 #endif