summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/common/meta.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/drivers/common/meta.c')
-rw-r--r--src/mesa/drivers/common/meta.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index ca6e966f919..e27b31eab09 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -347,7 +347,7 @@ _mesa_meta_setup_vertex_objects(struct gl_context *ctx,
GL_DYNAMIC_DRAW, __func__);
/* setup vertex arrays */
- FLUSH_VERTICES(ctx, 0);
+ FLUSH_VERTICES(ctx, 0, 0);
if (use_generic_attributes) {
assert(color_size == 0);
@@ -1077,7 +1077,7 @@ _mesa_meta_end(struct gl_context *ctx)
/* restore texture objects for unit[0] only */
for (tgt = 0; tgt < NUM_TEXTURE_TARGETS; tgt++) {
if (ctx->Texture.Unit[0].CurrentTex[tgt] != save->CurrentTexture[tgt]) {
- FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+ FLUSH_VERTICES(ctx, _NEW_TEXTURE, GL_TEXTURE_BIT);
_mesa_reference_texobj(&ctx->Texture.Unit[0].CurrentTex[tgt],
save->CurrentTexture[tgt]);
}
@@ -1087,12 +1087,12 @@ _mesa_meta_end(struct gl_context *ctx)
/* Restore fixed function texture enables, texgen */
for (u = 0; u < ctx->Const.MaxTextureUnits; u++) {
if (ctx->Texture.FixedFuncUnit[u].Enabled != save->TexEnabled[u]) {
- FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+ FLUSH_VERTICES(ctx, _NEW_TEXTURE, GL_TEXTURE_BIT);
ctx->Texture.FixedFuncUnit[u].Enabled = save->TexEnabled[u];
}
if (ctx->Texture.FixedFuncUnit[u].TexGenEnabled != save->TexGenEnabled[u]) {
- FLUSH_VERTICES(ctx, _NEW_TEXTURE);
+ FLUSH_VERTICES(ctx, _NEW_TEXTURE, GL_TEXTURE_BIT);
ctx->Texture.FixedFuncUnit[u].TexGenEnabled = save->TexGenEnabled[u];
}
}
@@ -3324,7 +3324,7 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
GL_DYNAMIC_DRAW, __func__);
/* setup vertex arrays */
- FLUSH_VERTICES(ctx, 0);
+ FLUSH_VERTICES(ctx, 0, 0);
_mesa_update_array_format(ctx, array_obj, VERT_ATTRIB_POS,
3, GL_FLOAT, GL_RGBA, GL_FALSE,
GL_FALSE, GL_FALSE,
@@ -3336,7 +3336,7 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
- FLUSH_VERTICES(ctx, 0);
+ FLUSH_VERTICES(ctx, 0, 0);
_mesa_update_array_format(ctx, array_obj, VERT_ATTRIB_TEX(i),
2, GL_FLOAT, GL_RGBA, GL_FALSE,
GL_FALSE, GL_FALSE,