diff options
| author | Marek Olšák <[email protected]> | 2020-03-21 22:49:03 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2020-04-06 10:28:53 -0400 |
| commit | f3cce7087a562f77be7306e70d4e62bc214bb5fa (patch) | |
| tree | 1d5f93dc13deb0e7822a9296a4b48f61442ec665 /src/mesa/main/pixelstore.c | |
| parent | e630271e0ec3eee7d921d76d3924873f6ee6b59b (diff) | |
mesa: don't ever bind NullBufferObj for glBindBuffer targets
Since VAOs don't use NullBufferObj for vertex attribs anymore, let's remove
more uses of NullBufferObj.
Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4466>
Diffstat (limited to 'src/mesa/main/pixelstore.c')
| -rw-r--r-- | src/mesa/main/pixelstore.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/main/pixelstore.c b/src/mesa/main/pixelstore.c index 6123da92278..a7c3492b604 100644 --- a/src/mesa/main/pixelstore.c +++ b/src/mesa/main/pixelstore.c @@ -272,8 +272,7 @@ _mesa_init_pixelstore(struct gl_context *ctx) ctx->Pack.CompressedBlockHeight = 0; ctx->Pack.CompressedBlockDepth = 0; ctx->Pack.CompressedBlockSize = 0; - _mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj, - ctx->Shared->NullBufferObj); + _mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj, NULL); ctx->Unpack.Alignment = 4; ctx->Unpack.RowLength = 0; ctx->Unpack.ImageHeight = 0; @@ -287,8 +286,7 @@ _mesa_init_pixelstore(struct gl_context *ctx) ctx->Unpack.CompressedBlockHeight = 0; ctx->Unpack.CompressedBlockDepth = 0; ctx->Unpack.CompressedBlockSize = 0; - _mesa_reference_buffer_object(ctx, &ctx->Unpack.BufferObj, - ctx->Shared->NullBufferObj); + _mesa_reference_buffer_object(ctx, &ctx->Unpack.BufferObj, NULL); /* * _mesa_unpack_image() returns image data in this format. When we @@ -305,8 +303,7 @@ _mesa_init_pixelstore(struct gl_context *ctx) ctx->DefaultPacking.SwapBytes = GL_FALSE; ctx->DefaultPacking.LsbFirst = GL_FALSE; ctx->DefaultPacking.Invert = GL_FALSE; - _mesa_reference_buffer_object(ctx, &ctx->DefaultPacking.BufferObj, - ctx->Shared->NullBufferObj); + _mesa_reference_buffer_object(ctx, &ctx->DefaultPacking.BufferObj, NULL); } |