diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-23 11:12:22 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-12-23 11:12:22 +0100 |
| commit | 6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d (patch) | |
| tree | 8dc28411ab42ebb9183bc090c10024a39fc669d6 /mesalib/src/mesa/vbo/vbo.h | |
| parent | 22891980a76b862bfcda406521b454f072090fb8 (diff) | |
| parent | e22891346b85a7db40dec7260a100f90b451cbc8 (diff) | |
| download | vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.tar.gz vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.tar.bz2 vcxsrv-6f6a4d4a600eabf5d6a624eb5b0e98ee67afb52d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/dispatch.h
xorg-server/glx/glapi.c
xorg-server/glx/indirect_dispatch.h
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_reqsize.h
xorg-server/glx/indirect_size.h
xorg-server/glx/indirect_size_get.c
xorg-server/glx/indirect_size_get.h
xorg-server/glx/indirect_table.c
xorg-server/mi/mieq.c
Diffstat (limited to 'mesalib/src/mesa/vbo/vbo.h')
| -rw-r--r-- | mesalib/src/mesa/vbo/vbo.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesalib/src/mesa/vbo/vbo.h b/mesalib/src/mesa/vbo/vbo.h index f357657af..7384790e3 100644 --- a/mesalib/src/mesa/vbo/vbo.h +++ b/mesalib/src/mesa/vbo/vbo.h @@ -137,6 +137,9 @@ void vbo_check_buffers_are_unmapped(struct gl_context *ctx); void vbo_bind_arrays(struct gl_context *ctx); +size_t +count_tessellated_primitives(const struct _mesa_prim *prim); + void GLAPIENTRY _es_Color4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a); |