diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-26 08:07:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-26 08:07:23 +0100 |
| commit | cec4285e4e6b06babf340165148ff8c31601b382 (patch) | |
| tree | 9e19864958826fb517b22ba224aa713307272687 /mesalib/src/mesa/state_tracker | |
| parent | 0f333fb1102f4886a8ce39f3c09b12e89e5a7f19 (diff) | |
| parent | 4042ec939a2cdc8473479c900871c4c8c0b4e818 (diff) | |
| download | vcxsrv-cec4285e4e6b06babf340165148ff8c31601b382.tar.gz vcxsrv-cec4285e4e6b06babf340165148ff8c31601b382.tar.bz2 vcxsrv-cec4285e4e6b06babf340165148ff8c31601b382.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xkeyboard-config mesa git update 26 nov 2013
Diffstat (limited to 'mesalib/src/mesa/state_tracker')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_rasterpos.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_draw.c | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_draw.h | 6 | ||||
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_draw_feedback.c | 3 |
4 files changed, 9 insertions, 5 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_rasterpos.c b/mesalib/src/mesa/state_tracker/st_cb_rasterpos.c index 26a55909d..420dc5fc9 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_rasterpos.c +++ b/mesalib/src/mesa/state_tracker/st_cb_rasterpos.c @@ -254,7 +254,7 @@ st_RasterPos(struct gl_context *ctx, const GLfloat v[4]) * st_feedback_draw_vbo doesn't check for that flag. */ ctx->Array._DrawArrays = rs->arrays; st_feedback_draw_vbo(ctx, &rs->prim, 1, NULL, GL_TRUE, 0, 1, - NULL); + NULL, NULL); ctx->Array._DrawArrays = saved_arrays; /* restore draw's rasterization stage depending on rendermode */ diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c index 51bb23807..ef0a60732 100644 --- a/mesalib/src/mesa/state_tracker/st_draw.c +++ b/mesalib/src/mesa/state_tracker/st_draw.c @@ -195,7 +195,8 @@ st_draw_vbo(struct gl_context *ctx, 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) { struct st_context *st = st_context(ctx); struct pipe_index_buffer ibuffer = {0}; diff --git a/mesalib/src/mesa/state_tracker/st_draw.h b/mesalib/src/mesa/state_tracker/st_draw.h index 394473b20..9c4d6cbba 100644 --- a/mesalib/src/mesa/state_tracker/st_draw.h +++ b/mesalib/src/mesa/state_tracker/st_draw.h @@ -55,7 +55,8 @@ st_draw_vbo(struct gl_context *ctx, 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); extern void st_feedback_draw_vbo(struct gl_context *ctx, @@ -65,7 +66,8 @@ st_feedback_draw_vbo(struct gl_context *ctx, 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); /** * When drawing with VBOs, the addresses specified with diff --git a/mesalib/src/mesa/state_tracker/st_draw_feedback.c b/mesalib/src/mesa/state_tracker/st_draw_feedback.c index 1ac9585e7..f5566446f 100644 --- a/mesalib/src/mesa/state_tracker/st_draw_feedback.c +++ b/mesalib/src/mesa/state_tracker/st_draw_feedback.c @@ -116,7 +116,8 @@ st_feedback_draw_vbo(struct gl_context *ctx, 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) { struct st_context *st = st_context(ctx); struct pipe_context *pipe = st->pipe; |