draw: rename draw_vertex_shader.c -> draw_vs.c

diff --git a/src/gallium/auxiliary/draw/Makefile b/src/gallium/auxiliary/draw/Makefile
index 45def9153c588b232b6993abe773429084c067c0..9c416498838c6b446a5676686a2c0280d5beed4c 100644 (file)
--- a/src/gallium/auxiliary/draw/Makefile
+++ b/src/gallium/auxiliary/draw/Makefile
@@ -7,6 +7,7 @@ C_SOURCES = \
        draw_aaline.c \
        draw_aapoint.c \
        draw_clip.c \
+       draw_vs.c \
        draw_vs_exec.c \
        draw_vs_sse.c \
        draw_vs_llvm.c \
@@ -30,7 +31,6 @@ C_SOURCES = \
        draw_validate.c \
        draw_vbuf.c \
        draw_vertex.c \
-       draw_vertex_shader.c \
        draw_wide_line.c \
        draw_wide_point.c
 

diff --git a/src/gallium/auxiliary/draw/SConscript b/src/gallium/auxiliary/draw/SConscript
index bff32d2c8b16bcd30dd91a7ad7f29a31ae5cdd79..388d7879dd65e6102240c7d4cd9d3201641edb83 100644 (file)
--- a/src/gallium/auxiliary/draw/SConscript
+++ b/src/gallium/auxiliary/draw/SConscript
@@ -26,7 +26,7 @@ draw = env.ConvenienceLibrary(
                'draw_validate.c',
                'draw_vbuf.c',
                'draw_vertex.c',
-               'draw_vertex_shader.c',
+               'draw_vs.c',
                'draw_vs_exec.c',
                'draw_vs_llvm.c',
                'draw_vs_sse.c',

diff --git a/src/gallium/auxiliary/draw/draw_vertex_shader.c b/src/gallium/auxiliary/draw/draw_vertex_shader.c
deleted file mode 100644 (file)
index 03fe00a..0000000
--- a/src/gallium/auxiliary/draw/draw_vertex_shader.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/**************************************************************************
- * 
- * 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.
- * 
- **************************************************************************/
-
- /*
-  * Authors:
-  *   Keith Whitwell <keith@tungstengraphics.com>
-  *   Brian Paul
-  */
-
-#include "pipe/p_util.h"
-#include "pipe/p_shader_tokens.h"
-#include "draw_private.h"
-#include "draw_context.h"
-#include "draw_vs.h"
-
-
-
-struct draw_vertex_shader *
-draw_create_vertex_shader(struct draw_context *draw,
-                          const struct pipe_shader_state *shader)
-{
-   struct draw_vertex_shader *vs;
-
-   vs = draw_create_vs_llvm( draw, shader );
-   if (!vs) {
-      vs = draw_create_vs_sse( draw, shader );
-      if (!vs) {
-         vs = draw_create_vs_exec( draw, shader );
-      }
-   }
-
-   assert(vs);
-   return vs;
-}
-
-
-void
-draw_bind_vertex_shader(struct draw_context *draw,
-                        struct draw_vertex_shader *dvs)
-{
-   draw_do_flush( draw, DRAW_FLUSH_STATE_CHANGE );
-   
-   if (dvs) 
-   {
-      draw->vertex_shader = dvs;
-      draw->num_vs_outputs = dvs->info.num_outputs;
-      dvs->prepare( dvs, draw );
-   }
-   else {
-      draw->vertex_shader = NULL;
-      draw->num_vs_outputs = 0;
-   }
-}
-
-
-void
-draw_delete_vertex_shader(struct draw_context *draw,
-                          struct draw_vertex_shader *dvs)
-{
-   dvs->delete( dvs );
-}

diff --git a/src/gallium/auxiliary/draw/draw_vs.c b/src/gallium/auxiliary/draw/draw_vs.c
new file mode 100644 (file)
index 0000000..03fe00a
--- /dev/null
+++ b/src/gallium/auxiliary/draw/draw_vs.c
@@ -0,0 +1,85 @@
+/**************************************************************************
+ * 
+ * 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.
+ * 
+ **************************************************************************/
+
+ /*
+  * Authors:
+  *   Keith Whitwell <keith@tungstengraphics.com>
+  *   Brian Paul
+  */
+
+#include "pipe/p_util.h"
+#include "pipe/p_shader_tokens.h"
+#include "draw_private.h"
+#include "draw_context.h"
+#include "draw_vs.h"
+
+
+
+struct draw_vertex_shader *
+draw_create_vertex_shader(struct draw_context *draw,
+                          const struct pipe_shader_state *shader)
+{
+   struct draw_vertex_shader *vs;
+
+   vs = draw_create_vs_llvm( draw, shader );
+   if (!vs) {
+      vs = draw_create_vs_sse( draw, shader );
+      if (!vs) {
+         vs = draw_create_vs_exec( draw, shader );
+      }
+   }
+
+   assert(vs);
+   return vs;
+}
+
+
+void
+draw_bind_vertex_shader(struct draw_context *draw,
+                        struct draw_vertex_shader *dvs)
+{
+   draw_do_flush( draw, DRAW_FLUSH_STATE_CHANGE );
+   
+   if (dvs) 
+   {
+      draw->vertex_shader = dvs;
+      draw->num_vs_outputs = dvs->info.num_outputs;
+      dvs->prepare( dvs, draw );
+   }
+   else {
+      draw->vertex_shader = NULL;
+      draw->num_vs_outputs = 0;
+   }
+}
+
+
+void
+draw_delete_vertex_shader(struct draw_context *draw,
+                          struct draw_vertex_shader *dvs)
+{
+   dvs->delete( dvs );
+}