diff --git a/src/mapi/glapi/gen/ARB_direct_state_access.xml b/src/mapi/glapi/gen/ARB_direct_state_access.xml
index 21bf9acfea6..1d1b5072c20 100644
--- a/src/mapi/glapi/gen/ARB_direct_state_access.xml
+++ b/src/mapi/glapi/gen/ARB_direct_state_access.xml
@@ -375,7 +375,7 @@
    </function>
 
    <function name="TextureSubImage1D" no_error="true"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="level" type="GLint" />
       <param name="xoffset" type="GLint" />
@@ -386,7 +386,7 @@
    </function>
 
    <function name="TextureSubImage2D" no_error="true"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="level" type="GLint" />
       <param name="xoffset" type="GLint" />
@@ -399,7 +399,7 @@
    </function>
 
    <function name="TextureSubImage3D" no_error="true"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="level" type="GLint" />
       <param name="xoffset" type="GLint" />
@@ -414,7 +414,7 @@
    </function>
 
    <function name="CompressedTextureSubImage1D" no_error="true"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="level" type="GLint" />
       <param name="xoffset" type="GLint" />
@@ -425,7 +425,7 @@
    </function>
 
    <function name="CompressedTextureSubImage2D" no_error="true"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="level" type="GLint" />
       <param name="xoffset" type="GLint" />
@@ -438,7 +438,7 @@
    </function>
 
    <function name="CompressedTextureSubImage3D" no_error="true"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="level" type="GLint" />
       <param name="xoffset" type="GLint" />
@@ -530,7 +530,7 @@
    </function>
 
    <function name="GetTextureImage"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="level" type="GLint" />
       <param name="format" type="GLenum" />
@@ -540,7 +540,7 @@
    </function>
 
    <function name="GetCompressedTextureImage"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="level" type="GLint" />
       <param name="bufSize" type="GLsizei" />
diff --git a/src/mapi/glapi/gen/ARB_get_texture_sub_image.xml b/src/mapi/glapi/gen/ARB_get_texture_sub_image.xml
index 7a8df8bd9c1..1325aa9e132 100644
--- a/src/mapi/glapi/gen/ARB_get_texture_sub_image.xml
+++ b/src/mapi/glapi/gen/ARB_get_texture_sub_image.xml
@@ -8,7 +8,7 @@
 <category name="GL_ARB_get_texture_sub_image" number="165">
 
     <function name="GetTextureSubImage"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
         <param name="texture" type="GLuint"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -24,7 +24,7 @@
     </function>
 
     <function name="GetCompressedTextureSubImage"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
         <param name="texture" type="GLuint"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
diff --git a/src/mapi/glapi/gen/ARB_robustness.xml b/src/mapi/glapi/gen/ARB_robustness.xml
index c808eb34ae8..ca1ce7c729d 100644
--- a/src/mapi/glapi/gen/ARB_robustness.xml
+++ b/src/mapi/glapi/gen/ARB_robustness.xml
@@ -69,13 +69,13 @@
 
 
     <function name="GetnPolygonStippleARB"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
         <param name="bufSize" type="GLsizei"/>
         <param name="pattern" type="GLubyte *" output="true"/>
     </function>
 
     <function name="GetnTexImageARB"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="format" type="GLenum"/>
@@ -85,7 +85,7 @@
     </function>
 
     <function name="ReadnPixelsARB" no_error="true"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="width" type="GLsizei"/>
@@ -146,7 +146,7 @@
 
 <!-- OpenGL 1.3 sized buffer queries -->
     <function name="GetnCompressedTexImageARB"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="lod" type="GLint"/>
         <param name="bufSize" type="GLsizei"/>
diff --git a/src/mapi/glapi/gen/EXT_direct_state_access.xml b/src/mapi/glapi/gen/EXT_direct_state_access.xml
index 0f1055c80d2..f087de2473c 100644
--- a/src/mapi/glapi/gen/EXT_direct_state_access.xml
+++ b/src/mapi/glapi/gen/EXT_direct_state_access.xml
@@ -174,7 +174,7 @@
     </function>
 
    <function name="TextureImage1DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -187,7 +187,7 @@
    </function>
 
    <function name="TextureImage2DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -201,7 +201,7 @@
    </function>
 
    <function name="TextureImage3DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -216,7 +216,7 @@
    </function>
 
    <function name="TextureSubImage1DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -228,7 +228,7 @@
    </function>
 
    <function name="TextureSubImage2DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -242,7 +242,7 @@
    </function>
 
    <function name="TextureSubImage3DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -316,7 +316,7 @@
    </function>
 
    <function name="GetTextureImageEXT" deprecated="3.1"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -446,7 +446,7 @@
    </function>
 
    <function name="GetMultiTexImageEXT" deprecated="3.1"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -472,7 +472,7 @@
    </function>
 
    <function name="MultiTexImage1DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -485,7 +485,7 @@
    </function>
 
    <function name="MultiTexImage2DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -499,7 +499,7 @@
    </function>
 
    <function name="MultiTexImage3DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -514,7 +514,7 @@
    </function>
 
    <function name="MultiTexSubImage1DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -526,7 +526,7 @@
    </function>
 
    <function name="MultiTexSubImage2DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -540,7 +540,7 @@
    </function>
 
    <function name="MultiTexSubImage3DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -708,7 +708,7 @@
     </function>
 
    <function name="CompressedTextureImage1DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -720,7 +720,7 @@
    </function>
 
    <function name="CompressedTextureImage2DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -733,7 +733,7 @@
    </function>
 
    <function name="CompressedTextureImage3DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -747,7 +747,7 @@
    </function>
 
    <function name="CompressedTextureSubImage1DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -759,7 +759,7 @@
    </function>
 
    <function name="CompressedTextureSubImage2DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -773,7 +773,7 @@
    </function>
 
    <function name="CompressedTextureSubImage3DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -789,7 +789,7 @@
    </function>
 
    <function name="GetCompressedTextureImageEXT" deprecated="3.1"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
       <param name="texture" type="GLuint" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -797,7 +797,7 @@
    </function>
 
    <function name="CompressedMultiTexImage1DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -809,7 +809,7 @@
    </function>
 
    <function name="CompressedMultiTexImage2DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -822,7 +822,7 @@
    </function>
 
    <function name="CompressedMultiTexImage3DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -836,7 +836,7 @@
    </function>
 
    <function name="CompressedMultiTexSubImage1DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -848,7 +848,7 @@
    </function>
 
    <function name="CompressedMultiTexSubImage2DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -862,7 +862,7 @@
    </function>
 
    <function name="CompressedMultiTexSubImage3DEXT" deprecated="3.1" exec="dlist"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
@@ -878,7 +878,7 @@
    </function>
 
    <function name="GetCompressedMultiTexImageEXT" deprecated="3.1"
-             marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+             marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
       <param name="texunit" type="GLenum" />
       <param name="target" type="GLenum" />
       <param name="level" type="GLint" />
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index d12d33364ac..a22d6ce2085 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -2121,7 +2121,7 @@
     </function>
 
     <function name="PolygonStipple" deprecated="3.1" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="mask" type="const GLubyte *" img_width="32" img_height="32" img_format="GL_COLOR_INDEX" img_type="GL_BITMAP" img_target="0" img_pad_dimensions="false"/>
         <glx rop="102"/>
     </function>
@@ -2170,7 +2170,7 @@
     </function>
 
     <function name="TexImage1D" no_error="true" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLint"/>
@@ -2183,7 +2183,7 @@
     </function>
 
     <function name="TexImage2D" es1="1.0" es2="2.0" no_error="true" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLint"/>
@@ -2633,7 +2633,7 @@
     </function>
 
     <function name="PixelMapfv" deprecated="3.1" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="map" type="GLenum"/>
         <param name="mapsize" type="GLsizei" counter="true"/>
         <param name="values" type="const GLfloat *" count="mapsize"/>
@@ -2641,7 +2641,7 @@
     </function>
 
     <function name="PixelMapuiv" deprecated="3.1" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="map" type="GLenum"/>
         <param name="mapsize" type="GLsizei" counter="true"/>
         <param name="values" type="const GLuint *" count="mapsize"/>
@@ -2649,7 +2649,7 @@
     </function>
 
     <function name="PixelMapusv" deprecated="3.1" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="map" type="GLenum"/>
         <param name="mapsize" type="GLsizei" counter="true"/>
         <param name="values" type="const GLushort *" count="mapsize"/>
@@ -2671,7 +2671,7 @@
     </function>
 
     <function name="ReadPixels" es1="1.0" es2="2.0" no_error="true"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="width" type="GLsizei"/>
@@ -2776,28 +2776,28 @@
     </function>
 
     <function name="GetPixelMapfv" deprecated="3.1"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
         <param name="map" type="GLenum"/>
         <param name="values" type="GLfloat *" output="true" variable_param="map"/>
         <glx sop="125"/>
     </function>
 
     <function name="GetPixelMapuiv" deprecated="3.1"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
         <param name="map" type="GLenum"/>
         <param name="values" type="GLuint *" output="true" variable_param="map"/>
         <glx sop="126"/>
     </function>
 
     <function name="GetPixelMapusv" deprecated="3.1"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
         <param name="map" type="GLenum"/>
         <param name="values" type="GLushort *" output="true" variable_param="map"/>
         <glx sop="127"/>
     </function>
 
     <function name="GetPolygonStipple" deprecated="3.1"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
         <param name="mask" type="GLubyte *" output="true" img_width="32" img_height="32" img_format="GL_COLOR_INDEX" img_type="GL_BITMAP"/>
         <glx sop="128"/>
     </function>
@@ -2844,7 +2844,7 @@
     </function>
 
     <function name="GetTexImage"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="format" type="GLenum"/>
@@ -3345,7 +3345,7 @@
     </function>
 
     <function name="TexSubImage1D" no_error="true" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -3358,7 +3358,7 @@
     </function>
 
     <function name="TexSubImage2D" es1="1.0" es2="2.0" no_error="true" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -4061,7 +4061,7 @@
     </function>
 
     <function name="TexImage3D" es2="3.0" no_error="true" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLint"/>
@@ -4076,7 +4076,7 @@
     </function>
 
     <function name="TexSubImage3D" es2="3.0" no_error="true" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -4554,7 +4554,7 @@
     </function>
 
     <function name="CompressedTexImage3D" es2="3.0" no_error="true" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
@@ -4568,7 +4568,7 @@
     </function>
 
     <function name="CompressedTexImage2D" es1="1.0" es2="2.0" no_error="true" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
@@ -4581,7 +4581,7 @@
     </function>
 
     <function name="CompressedTexImage1D" no_error="true" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="internalformat" type="GLenum"/>
@@ -4593,7 +4593,7 @@
     </function>
 
     <function name="CompressedTexSubImage3D" es2="3.0" no_error="true" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -4609,7 +4609,7 @@
     </function>
 
     <function name="CompressedTexSubImage2D" es1="1.0" es2="2.0" no_error="true" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -4623,7 +4623,7 @@
     </function>
 
     <function name="CompressedTexSubImage1D" no_error="true" exec="dlist"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_unpack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_unpack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="xoffset" type="GLint"/>
@@ -4635,7 +4635,7 @@
     </function>
 
     <function name="GetCompressedTexImage"
-              marshal="async" marshal_sync="_mesa_glthread_has_no_pack_buffer(ctx)">
+              marshal="async" marshal_sync="!_mesa_glthread_has_pack_buffer(ctx)">
         <param name="target" type="GLenum"/>
         <param name="level" type="GLint"/>
         <param name="img" type="GLvoid *" output="true"/>
diff --git a/src/mesa/main/glthread_marshal.h b/src/mesa/main/glthread_marshal.h
index 5084301ebbf..b7dbfc35f4b 100644
--- a/src/mesa/main/glthread_marshal.h
+++ b/src/mesa/main/glthread_marshal.h
@@ -137,15 +137,15 @@ _mesa_glthread_call_is_last(struct glthread_state *glthread,
 }
 
 static inline bool
-_mesa_glthread_has_no_pack_buffer(const struct gl_context *ctx)
+_mesa_glthread_has_pack_buffer(const struct gl_context *ctx)
 {
-   return ctx->GLThread.CurrentPixelPackBufferName == 0;
+   return ctx->GLThread.CurrentPixelPackBufferName != 0;
 }
 
 static inline bool
-_mesa_glthread_has_no_unpack_buffer(const struct gl_context *ctx)
+_mesa_glthread_has_unpack_buffer(const struct gl_context *ctx)
 {
-   return ctx->GLThread.CurrentPixelUnpackBufferName == 0;
+   return ctx->GLThread.CurrentPixelUnpackBufferName != 0;
 }
 
 static inline unsigned
diff --git a/src/mesa/main/glthread_pixels.c b/src/mesa/main/glthread_pixels.c
index bceef8081dd..5f4836b1cdb 100644
--- a/src/mesa/main/glthread_pixels.c
+++ b/src/mesa/main/glthread_pixels.c
@@ -47,7 +47,7 @@ _mesa_marshal_Bitmap(GLsizei width, GLsizei height, GLfloat xorig,
       /* PBO path or bitmap == NULL (which means xmove/ymove only move the raster
        * pos.
        */
-      if (!bitmap || !_mesa_glthread_has_no_unpack_buffer(ctx)) {
+      if (!bitmap || _mesa_glthread_has_unpack_buffer(ctx)) {
          struct marshal_cmd_Bitmap *cmd =
             _mesa_glthread_allocate_command(ctx, DISPATCH_CMD_Bitmap,
                                             cmd_size);
@@ -120,7 +120,7 @@ _mesa_marshal_DrawPixels(GLsizei width, GLsizei height, GLenum format,
    /* If not building a display list... */
    if (!ctx->GLThread.ListMode) {
       /* PBO */
-      if (!_mesa_glthread_has_no_unpack_buffer(ctx)) {
+      if (_mesa_glthread_has_unpack_buffer(ctx)) {
          struct marshal_cmd_DrawPixels *cmd =
             _mesa_glthread_allocate_command(ctx, DISPATCH_CMD_DrawPixels,
                                             cmd_size);