Mesa (master): main: Cosmetic changes for Texture Buffers.
Laura Ekstrand
ldeks at kemper.freedesktop.org
Mon Mar 9 20:34:45 UTC 2015
Module: Mesa
Branch: master
Commit: 0f6372946b8bf52658140508d6501fe1bfd180d0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0f6372946b8bf52658140508d6501fe1bfd180d0
Author: Laura Ekstrand <laura at jlekstrand.net>
Date: Wed Mar 4 14:34:27 2015 -0800
main: Cosmetic changes for Texture Buffers.
Adds a useful comment and some whitespace. Fixes an error message.
v2: Review from Anuj Phogat
- Split rebase of Tex[ture]Buffer[Range]
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
---
src/mesa/main/teximage.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 706c76b..b4b5ac5 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -5354,6 +5354,14 @@ _mesa_TexBufferRange(GLenum target, GLenum internalFormat, GLuint buffer,
buffer);
return;
} else {
+
+ /* OpenGL 4.5 core spec (02.02.2015) says in Section 8.9 Buffer
+ * Textures (PDF page 254):
+ * "If buffer is zero, then any buffer object attached to the buffer
+ * texture is detached, the values offset and size are ignored and
+ * the state for offset and size for the buffer texture are reset to
+ * zero."
+ */
offset = 0;
size = 0;
}
@@ -5382,8 +5390,7 @@ _mesa_TextureBuffer(GLuint texture, GLenum internalFormat, GLuint buffer)
bufObj = NULL;
/* Get the texture object by Name. */
- texObj = _mesa_lookup_texture_err(ctx, texture,
- "glTextureBuffer(texture)");
+ texObj = _mesa_lookup_texture_err(ctx, texture, "glTextureBuffer");
if (!texObj)
return;
More information about the mesa-commit
mailing list