<div dir="ltr">Ian has asked that this not be squashed. In fact, they were the same commit last time around on the ML.<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Feb 20, 2015 at 12:29 AM, Martin Peres <span dir="ltr"><<a href="mailto:martin.peres@free.fr" target="_blank">martin.peres@free.fr</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Please squash this commit with the one introducing GetBufferSubData.<br>
<br>
It should be pretty easy to do with git rebase -i :)<div class="HOEnZb"><div class="h5"><br>
<br>
On 12/02/2015 04:06, Laura Ekstrand wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
src/mesa/main/bufferobj.c | 2 +-<br>
src/mesa/main/bufferobj.h | 4 ++--<br>
2 files changed, 3 insertions(+), 3 deletions(-)<br>
<br>
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c<br>
index 0272704..38d8b5a 100644<br>
--- a/src/mesa/main/bufferobj.c<br>
+++ b/src/mesa/main/bufferobj.c<br>
@@ -1668,7 +1668,7 @@ _mesa_GetBufferSubData(GLenum target, GLintptr offset,<br>
}<br>
ASSERT(ctx->Driver.<u></u>GetBufferSubData);<br>
- ctx->Driver.GetBufferSubData( ctx, offset, size, data, bufObj );<br>
+ ctx->Driver.GetBufferSubData(<u></u>ctx, offset, size, data, bufObj);<br>
}<br>
void GLAPIENTRY<br>
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h<br>
index feeaa8b..b5d73ae 100644<br>
--- a/src/mesa/main/bufferobj.h<br>
+++ b/src/mesa/main/bufferobj.h<br>
@@ -230,8 +230,8 @@ _mesa_NamedBufferSubData(<u></u>GLuint buffer, GLintptr offset,<br>
GLsizeiptr size, const GLvoid *data);<br>
void GLAPIENTRY<br>
-_mesa_GetBufferSubData(GLenum target, GLintptrARB offset,<br>
- GLsizeiptrARB size, void * data);<br>
+_mesa_GetBufferSubData(GLenum target, GLintptr offset,<br>
+ GLsizeiptr size, GLvoid *data);<br>
void GLAPIENTRY<br>
_mesa_GetNamedBufferSubData(<u></u>GLuint buffer, GLintptr offset,<br>
</blockquote>
<br>
</div></div></blockquote></div><br></div>