diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-11 17:43:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-11 17:43:25 +0200 |
| commit | 26dfcdba6c306d6312c598e4191449302329be68 (patch) | |
| tree | 2bf56b5a0eb2cc554833fdc6e08f2b59f1bfdabd /mesalib/src/mesa/main/transformfeedback.c | |
| parent | 2dc2880eacae3d52f4ab4bb5ec43c5bbf50c5c3f (diff) | |
| parent | ae06feae7876db47ff0e1fde40cf4a324a412037 (diff) | |
| download | vcxsrv-26dfcdba6c306d6312c598e4191449302329be68.tar.gz vcxsrv-26dfcdba6c306d6312c598e4191449302329be68.tar.bz2 vcxsrv-26dfcdba6c306d6312c598e4191449302329be68.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/imports.h
Diffstat (limited to 'mesalib/src/mesa/main/transformfeedback.c')
| -rw-r--r-- | mesalib/src/mesa/main/transformfeedback.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/mesalib/src/mesa/main/transformfeedback.c b/mesalib/src/mesa/main/transformfeedback.c index abeb25e87..a73746335 100644 --- a/mesalib/src/mesa/main/transformfeedback.c +++ b/mesalib/src/mesa/main/transformfeedback.c @@ -32,7 +32,6 @@ #include "buffers.h" -#include "bufferobj.h" #include "context.h" #include "hash.h" #include "macros.h" @@ -533,14 +532,7 @@ bind_buffer_range(struct gl_context *ctx, GLuint index, bufObj); /* The per-attribute binding point */ - _mesa_reference_buffer_object(ctx, - &obj->Buffers[index], - bufObj); - - obj->BufferNames[index] = bufObj->Name; - - obj->Offset[index] = offset; - obj->RequestedSize[index] = size; + _mesa_set_transform_feedback_binding(ctx, obj, index, bufObj, offset, size); } |