diff options
| author | Timothy Arceri <[email protected]> | 2017-05-12 17:10:10 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2017-05-17 10:12:03 +1000 |
| commit | 5d29e6aab8ac05cbd73433b45958b2f82eefa91d (patch) | |
| tree | db63712297054ce10869c15684d4788209390cad /src/mesa/drivers | |
| parent | 624dc2833e0d0263b434e234437dfbd9f4840b75 (diff) | |
mesa: create validate_buffer_sub_data() helper
This change assumes meta will always pass valid arguments to
_mesa_buffer_sub_data().
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 12 | ||||
| -rw-r--r-- | src/mesa/drivers/common/meta_blit.c | 3 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 47ef16b3e7d..1ff46515f12 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -1902,8 +1902,7 @@ _mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY, verts[3].tex[1] = tex->Ttop; /* upload new vertex data */ - _mesa_buffer_sub_data(ctx, copypix->buf_obj, 0, sizeof(verts), verts, - __func__); + _mesa_buffer_sub_data(ctx, copypix->buf_obj, 0, sizeof(verts), verts); } _mesa_set_enable(ctx, tex->Target, GL_TRUE); @@ -2422,8 +2421,7 @@ _mesa_meta_Bitmap(struct gl_context *ctx, } /* upload new vertex data */ - _mesa_buffer_sub_data(ctx, bitmap->buf_obj, 0, sizeof(verts), verts, - __func__); + _mesa_buffer_sub_data(ctx, bitmap->buf_obj, 0, sizeof(verts), verts); } /* choose different foreground/background alpha values */ @@ -3140,8 +3138,7 @@ decompress_texture_image(struct gl_context *ctx, _mesa_set_viewport(ctx, 0, 0, 0, width, height); /* upload new vertex data */ - _mesa_buffer_sub_data(ctx, decompress->buf_obj, 0, sizeof(verts), verts, - __func__); + _mesa_buffer_sub_data(ctx, decompress->buf_obj, 0, sizeof(verts), verts); /* setup texture state */ _mesa_BindTexture(target, texObj->Name); @@ -3409,8 +3406,7 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, verts[3].st[i][1] = t1; } - _mesa_buffer_sub_data(ctx, drawtex->buf_obj, 0, sizeof(verts), verts, - __func__); + _mesa_buffer_sub_data(ctx, drawtex->buf_obj, 0, sizeof(verts), verts); } _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); diff --git a/src/mesa/drivers/common/meta_blit.c b/src/mesa/drivers/common/meta_blit.c index 991d52f21e9..e8719a3a770 100644 --- a/src/mesa/drivers/common/meta_blit.c +++ b/src/mesa/drivers/common/meta_blit.c @@ -800,8 +800,7 @@ blitframebuffer_texture(struct gl_context *ctx, verts[3].tex[1] = t1; verts[3].tex[2] = readAtt->Zoffset; - _mesa_buffer_sub_data(ctx, blit->buf_obj, 0, sizeof(verts), verts, - __func__); + _mesa_buffer_sub_data(ctx, blit->buf_obj, 0, sizeof(verts), verts); } /* setup viewport */ |