<div dir="ltr">I'm confused which hunk you talking about. Can you be more specific? </div><div class="gmail_extra"> <div class="gmail_quote">On Mon, Mar 9, 2015 at 8:47 AM, Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com" target="_blank">anuj.phogat@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On Wed, Mar 4, 2015 at 4:41 PM, Laura Ekstrand <<a href="mailto:laura@jlekstrand.net">laura@jlekstrand.net</a>> wrote: > Adds a useful comment and some whitespace. Fixes an error message. > > v2: Review from Anuj Phogat > - Split rebase of Tex[ture]Buffer[Range] > --- > src/mesa/main/teximage.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c > index 706c76b..22574bd 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; > > @@ -5396,6 +5403,7 @@ _mesa_TextureBuffer(GLuint texture, GLenum internalFormat, GLuint buffer) > bufObj, 0, buffer ? -1 : 0, "glTextureBuffer"); > } > > + > static GLboolean > is_renderable_texture_format(struct gl_context *ctx, GLenum internalformat) > { </div></div>This hunk is unnecessary. > -- > 2.1.0 > > _______________________________________________ > mesa-dev mailing list > <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> > <a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div>