diff options
| author | Ian Romanick <[email protected]> | 2015-11-05 14:31:23 -0800 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2015-11-24 11:36:06 -0800 |
| commit | 7ebc8c36a0dd5ed523c4858f1f3ef4ecc5883aeb (patch) | |
| tree | 0f18ab3bbdeba747dbda130f1f85d3b8acb5a782 | |
| parent | 79468fac69974bd94fe2bda0882ca97c83abfd41 (diff) | |
meta: Track VBO using gl_buffer_object instead of GL API object handle in _mesa_meta_DrawTex
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Anuj Phogat <[email protected]>
(cherry picked from commit b8a7369fb7e5773892d01fcb1140fe6569ee27eb)
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 23 | ||||
| -rw-r--r-- | src/mesa/drivers/common/meta.h | 2 |
2 files changed, 19 insertions, 6 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 328e06069d4..b38ac902264 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -3310,20 +3310,32 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, if (drawtex->VAO == 0) { /* one-time setup */ GLint active_texture; + GLuint VBO; /* create vertex array object */ _mesa_GenVertexArrays(1, &drawtex->VAO); _mesa_BindVertexArray(drawtex->VAO); /* create vertex array buffer */ - _mesa_CreateBuffers(1, &drawtex->VBO); - _mesa_NamedBufferData(drawtex->VBO, sizeof(verts), - NULL, GL_DYNAMIC_DRAW_ARB); + _mesa_CreateBuffers(1, &VBO); + drawtex->buf_obj = _mesa_lookup_bufferobj(ctx, VBO); + + /* _mesa_lookup_bufferobj only returns NULL if name is 0. If the object + * does not yet exist (i.e., hasn't been bound) it will return a dummy + * object that you can't do anything with. + */ + assert(drawtex->buf_obj != NULL && (drawtex->buf_obj)->Name == VBO); + assert(drawtex->buf_obj == ctx->Array.ArrayBufferObj); + + _mesa_buffer_data(ctx, drawtex->buf_obj, GL_NONE, sizeof(verts), verts, + GL_DYNAMIC_DRAW, __func__); + + assert(drawtex->buf_obj->Size == sizeof(verts)); /* client active texture is not part of the array object */ active_texture = ctx->Array.ActiveTexture; - _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, drawtex->VBO); + _mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, VBO); /* setup vertex arrays */ _mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x)); @@ -3403,7 +3415,8 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z, verts[3].st[i][1] = t1; } - _mesa_NamedBufferSubData(drawtex->VBO, 0, sizeof(verts), verts); + _mesa_buffer_sub_data(ctx, drawtex->buf_obj, 0, sizeof(verts), verts, + __func__); } _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4); diff --git a/src/mesa/drivers/common/meta.h b/src/mesa/drivers/common/meta.h index 6df76ae6f3d..e55fd86f092 100644 --- a/src/mesa/drivers/common/meta.h +++ b/src/mesa/drivers/common/meta.h @@ -408,7 +408,7 @@ struct decompress_state struct drawtex_state { GLuint VAO; - GLuint VBO; + struct gl_buffer_object *buf_obj; }; #define MAX_META_OPS_DEPTH 8 |