etnaviv: add anisotropic filter support

[mesa.git] / src / mesa / main / externalobjects.c

diff --git a/src/mesa/main/externalobjects.c b/src/mesa/main/externalobjects.c
index 35545c2e556a3f055f86c3fd055e03dbdc7ef9f0..777a5dd5acd0c799a570106a1be590d476347bd1 100644 (file)
--- a/src/mesa/main/externalobjects.c
+++ b/src/mesa/main/externalobjects.c
@@ -30,6 +30,7 @@
 #include "texobj.h"
 #include "glformats.h"
 #include "texstorage.h"
+#include "util/u_memory.h"
 
 /**
  * Allocate and initialize a new memory object.  But don't put it into the
@@ -734,9 +735,8 @@ _mesa_WaitSemaphoreEXT(GLuint semaphore,
       return;
 
    FLUSH_VERTICES(ctx, 0);
-   FLUSH_CURRENT(ctx, 0);
 
-   bufObjs = malloc(sizeof(struct gl_buffer_object **) * numBufferBarriers);
+   bufObjs = malloc(sizeof(struct gl_buffer_object *) * numBufferBarriers);
    if (!bufObjs) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s(numBufferBarriers=%u)",
                   func, numBufferBarriers);
@@ -747,7 +747,7 @@ _mesa_WaitSemaphoreEXT(GLuint semaphore,
       bufObjs[i] = _mesa_lookup_bufferobj(ctx, buffers[i]);
    }
 
-   texObjs = malloc(sizeof(struct gl_texture_object **) * numTextureBarriers);
+   texObjs = malloc(sizeof(struct gl_texture_object *) * numTextureBarriers);
    if (!texObjs) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s(numTextureBarriers=%u)",
                   func, numTextureBarriers);
@@ -795,9 +795,8 @@ _mesa_SignalSemaphoreEXT(GLuint semaphore,
       return;
 
    FLUSH_VERTICES(ctx, 0);
-   FLUSH_CURRENT(ctx, 0);
 
-   bufObjs = malloc(sizeof(struct gl_buffer_object **) * numBufferBarriers);
+   bufObjs = malloc(sizeof(struct gl_buffer_object *) * numBufferBarriers);
    if (!bufObjs) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s(numBufferBarriers=%u)",
                   func, numBufferBarriers);
@@ -808,7 +807,7 @@ _mesa_SignalSemaphoreEXT(GLuint semaphore,
       bufObjs[i] = _mesa_lookup_bufferobj(ctx, buffers[i]);
    }
 
-   texObjs = malloc(sizeof(struct gl_texture_object **) * numTextureBarriers);
+   texObjs = malloc(sizeof(struct gl_texture_object *) * numTextureBarriers);
    if (!texObjs) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s(numTextureBarriers=%u)",
                   func, numTextureBarriers);