On Thursday, July 17, 2014 02:41:31 PM Jason Ekstrand wrote: > Signed-off-by: Jason Ekstrand <jason.ekstr...@intel.com> > --- > src/mesa/drivers/dri/i965/intel_tex_subimage.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/src/mesa/drivers/dri/i965/intel_tex_subimage.c > b/src/mesa/drivers/dri/i965/intel_tex_subimage.c > index 04cbc4c..4043eb7 100644 > --- a/src/mesa/drivers/dri/i965/intel_tex_subimage.c > +++ b/src/mesa/drivers/dri/i965/intel_tex_subimage.c > @@ -585,6 +585,16 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx, > } else if (format == GL_RGBA) { > mem_copy = rgba8_copy; > } > + } else if ((texImage->TexFormat == MESA_FORMAT_R8G8B8A8_UNORM) || > + (texImage->TexFormat == MESA_FORMAT_R8G8B8X8_UNORM)) { > + cpp = 4; > + if (format == GL_BGRA) { > + /* Copying from RGBA to BGRA is the same as BGRA to RGBA so we can > + * use the same function. */
*/ goes on a separate line. Patch 2 is: Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> (patch 1 looks fine too but I didn't check it very thoroughly) > + mem_copy = rgba8_copy; > + } else if (format == GL_RGBA) { > + mem_copy = memcpy; > + } > } > if (!mem_copy) > return false; >
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev