projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: initialize "is_layered" variable to silence warning
[mesa.git]
/
src
/
mesa
/
vbo
/
vbo.h
diff --git
a/src/mesa/vbo/vbo.h
b/src/mesa/vbo/vbo.h
index c4472e9c2ebd4336bf38ceffaafc9d26961fba81..6e1a4aa1ad6cebccf410e337481f248edb92eb51 100644
(file)
--- a/
src/mesa/vbo/vbo.h
+++ b/
src/mesa/vbo/vbo.h
@@
-46,13
+46,16
@@
struct _mesa_prim {
GLuint end:1;
GLuint weak:1;
GLuint no_current_update:1;
GLuint end:1;
GLuint weak:1;
GLuint no_current_update:1;
- GLuint pad:19;
+ GLuint is_indirect:1;
+ GLuint pad:18;
GLuint start;
GLuint count;
GLint basevertex;
GLuint num_instances;
GLuint base_instance;
GLuint start;
GLuint count;
GLint basevertex;
GLuint num_instances;
GLuint base_instance;
+
+ GLsizeiptr indirect_offset;
};
/* Would like to call this a "vbo_index_buffer", but this would be
};
/* Would like to call this a "vbo_index_buffer", but this would be
@@
-89,7
+92,8
@@
typedef void (*vbo_draw_func)( struct gl_context *ctx,
GLboolean index_bounds_valid,
GLuint min_index,
GLuint max_index,
GLboolean index_bounds_valid,
GLuint min_index,
GLuint max_index,
- struct gl_transform_feedback_object *tfb_vertcount );
+ struct gl_transform_feedback_object *tfb_vertcount,
+ struct gl_buffer_object *indirect );
@@
-182,7
+186,8
@@
void
vbo_sw_primitive_restart(struct gl_context *ctx,
const struct _mesa_prim *prim,
GLuint nr_prims,
vbo_sw_primitive_restart(struct gl_context *ctx,
const struct _mesa_prim *prim,
GLuint nr_prims,
- const struct _mesa_index_buffer *ib);
+ const struct _mesa_index_buffer *ib,
+ struct gl_buffer_object *indirect);
void GLAPIENTRY
_es_Color4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a);
void GLAPIENTRY
_es_Color4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a);