Ian has asked that this not be squashed. In fact, they were the same commit last time around on the ML.
On Fri, Feb 20, 2015 at 12:29 AM, Martin Peres <martin.pe...@free.fr> wrote: > Please squash this commit with the one introducing GetBufferSubData. > > It should be pretty easy to do with git rebase -i :) > > > On 12/02/2015 04:06, Laura Ekstrand wrote: > >> --- >> src/mesa/main/bufferobj.c | 2 +- >> src/mesa/main/bufferobj.h | 4 ++-- >> 2 files changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c >> index 0272704..38d8b5a 100644 >> --- a/src/mesa/main/bufferobj.c >> +++ b/src/mesa/main/bufferobj.c >> @@ -1668,7 +1668,7 @@ _mesa_GetBufferSubData(GLenum target, GLintptr >> offset, >> } >> ASSERT(ctx->Driver.GetBufferSubData); >> - ctx->Driver.GetBufferSubData( ctx, offset, size, data, bufObj ); >> + ctx->Driver.GetBufferSubData(ctx, offset, size, data, bufObj); >> } >> void GLAPIENTRY >> diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h >> index feeaa8b..b5d73ae 100644 >> --- a/src/mesa/main/bufferobj.h >> +++ b/src/mesa/main/bufferobj.h >> @@ -230,8 +230,8 @@ _mesa_NamedBufferSubData(GLuint buffer, GLintptr >> offset, >> GLsizeiptr size, const GLvoid *data); >> void GLAPIENTRY >> -_mesa_GetBufferSubData(GLenum target, GLintptrARB offset, >> - GLsizeiptrARB size, void * data); >> +_mesa_GetBufferSubData(GLenum target, GLintptr offset, >> + GLsizeiptr size, GLvoid *data); >> void GLAPIENTRY >> _mesa_GetNamedBufferSubData(GLuint buffer, GLintptr offset, >> > >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
