diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-05-31 19:10:55 -0700 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-06-30 14:20:25 +0100 |
| commit | 461e5b68a82b11d10b959cc019bd5b0af2aec621 (patch) | |
| tree | 421c9d5bac769537775a1e30548f47e9bfc805e2 | |
| parent | 292ec86ed0254d8c9e5bb4205be9e18e905d7235 (diff) | |
st_vbo: move decl down to save code
| -rw-r--r-- | progs/samples/line.c | 2 | ||||
| -rw-r--r-- | progs/trivial/Makefile | 1 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_vbo/st_vbo_attrib.h | 1 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_vbo/st_vbo_save.h | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/progs/samples/line.c b/progs/samples/line.c index 83f70cb3ac..c37272bb47 100644 --- a/progs/samples/line.c +++ b/progs/samples/line.c @@ -138,7 +138,7 @@ static void Draw(void) glShadeModel( GL_FLAT ); - for (i = 0; i < 360; i += 5) { + for (i = 0; i < 15; i += 5) { glRotatef(5.0, 0,0,1); (rgb) ? glColor3f(1.0, 1.0, 0.0) : glIndexi(ci); diff --git a/progs/trivial/Makefile b/progs/trivial/Makefile index 22de83fa79..8989963aad 100644 --- a/progs/trivial/Makefile +++ b/progs/trivial/Makefile @@ -38,6 +38,7 @@ SOURCES = \ line-userclip-nop.c \ line-userclip.c \ line-wide.c \ + line-line.c \ line.c \ lineloop-clip.c \ lineloop-elts.c \ diff --git a/src/mesa/state_tracker/st_vbo/st_vbo_attrib.h b/src/mesa/state_tracker/st_vbo/st_vbo_attrib.h index 29efcf2306..132dbba9ec 100644 --- a/src/mesa/state_tracker/st_vbo/st_vbo_attrib.h +++ b/src/mesa/state_tracker/st_vbo/st_vbo_attrib.h @@ -102,6 +102,5 @@ enum { #define ST_VBO_ATTRIB_FIRST_MATERIAL ST_VBO_ATTRIB_MAT_FRONT_AMBIENT #define ST_VBO_ATTRIB_LAST_MATERIAL ST_VBO_ATTRIB_MAT_BACK_INDEXES -#define ST_VBO_MAX_COPIED_VERTS 3 #endif diff --git a/src/mesa/state_tracker/st_vbo/st_vbo_save.h b/src/mesa/state_tracker/st_vbo/st_vbo_save.h index e6d846d4b2..eb953ff44f 100644 --- a/src/mesa/state_tracker/st_vbo/st_vbo_save.h +++ b/src/mesa/state_tracker/st_vbo/st_vbo_save.h @@ -39,6 +39,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "st_vbo_attrib.h" +#define ST_VBO_MAX_COPIED_VERTS 3 + struct st_vbo_save_copied_vtx { GLfloat buffer[ST_VBO_ATTRIB_MAX * 4 * ST_VBO_MAX_COPIED_VERTS]; GLuint nr; |