On 03/05/2015 06:55 PM, Laura Ekstrand wrote: > > On Thu, Mar 5, 2015 at 12:20 AM, Eduardo Lima Mitev <el...@igalia.com > <mailto:el...@igalia.com>> wrote: > > diff --git a/src/mesa/drivers/common/meta_tex_subimage.c > b/src/mesa/drivers/common/meta_tex_subimage.c > index bba2b4f..34ef191 100644 > --- a/src/mesa/drivers/common/meta_tex_subimage.c > +++ b/src/mesa/drivers/common/meta_tex_subimage.c > @@ -149,34 +149,12 @@ _mesa_meta_pbo_TexSubImage(struct gl_context > *ctx, GLuint dims, > bool success = false; > int z, iters; > > - /* XXX: This should probably be passed in from somewhere */ > - const char *where = "_mesa_meta_pbo_TexSubImage"; > - > if (!_mesa_is_bufferobj(packing->BufferObj) && !create_pbo) > return false; > > You can't get rid of this block. It's not part of the PBO checking > code; it's here because _mesa_meta_texsubimage can't handle these formats. >
Oh yes, this is indeed a mistake. When I started removing the PBO checks I thought this block could also be moved to general code, and I experimented a bit with that. At some point I discarded it, but apparently it slipped into the final patch. good catch, thank you! I will update this patch. Eduardo > - if (format == GL_DEPTH_COMPONENT || > - format == GL_DEPTH_STENCIL || > - format == GL_STENCIL_INDEX || > - format == GL_COLOR_INDEX) > - return false; > - _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev