r300c/r300g: add 3155 rv380 pci id

[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 b7864e9f2f0b77025b29ec035a89233f69bfbe41..0eda414ee6ae27f6beb4b9e0e0773afd1fcdacb0 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_vs_aos_machine.c
+++ b/src/gallium/auxiliary/draw/draw_vs_aos_machine.c
@@ -26,15 +26,21 @@
  **************************************************************************/
 
 
-#include "pipe/p_util.h"
+#include "pipe/p_config.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"
 
 
@@ -68,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
@@ -102,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;
       }
@@ -213,10 +219,12 @@ static void PIPE_CDECL populate_lut( struct aos_machine *machine,
 }
 
 
-void draw_vs_aos_machine_constants( struct aos_machine *machine,
-                                    const float (*constants)[4] )
+void
+draw_vs_aos_machine_constants(struct aos_machine *machine,
+                              unsigned slot,
+                              const void *constants)
 {
-   machine->constants = constants;
+   machine->constants[slot] = constants;
 
    {
       unsigned i;
@@ -294,4 +302,27 @@ 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,
+                              unsigned slot,
+                              const void *constants)
+{
+}
+
+void draw_vs_aos_machine_destroy( struct aos_machine *machine )
+{
+}
+
+struct aos_machine *draw_vs_aos_machine( void )
+{
+   return NULL;
+}
+#endif