On Mon, Mar 9, 2015 at 9:43 AM, Laura Ekstrand <la...@jlekstrand.net> wrote: > I'm confused which hunk you talking about. Can you be more specific? > > On Mon, Mar 9, 2015 at 8:47 AM, Anuj Phogat <anuj.pho...@gmail.com> wrote: >> >> On Wed, Mar 4, 2015 at 4:41 PM, Laura Ekstrand <la...@jlekstrand.net> >> 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"); >> > } >> > >> > + I meant this extra new line here. It's a nitpick. Up to you if you want to keep it.
>> > static GLboolean >> > is_renderable_texture_format(struct gl_context *ctx, GLenum >> > internalformat) >> > { >> This hunk is unnecessary. >> > -- >> > 2.1.0 >> > >> > _______________________________________________ >> > mesa-dev mailing list >> > mesa-dev@lists.freedesktop.org >> > http://lists.freedesktop.org/mailman/listinfo/mesa-dev > > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev