Attachment #195408 for bug #275002

View | Details | Raw Unified | Return to bug 275002
Collapse All | Expand All




   if (border)
      goto fail;

   /* Setup or redefine the texture object, mipmap tree and texture
    * image.  Don't populate yet.  
    */
   ctx->Driver.TexImage2D(ctx, target, level, internalFormat,
                          width, height, border,
                          GL_RGBA, CHAN_TYPE, NULL,
                          &ctx->DefaultPacking, texObj, texImage);

	 srcx = x;
   srcy = y;
   dstx = 0;
   dsty = 0;

				   &width, &height))
      return;

   /* Setup or redefine the texture object, mipmap tree and texture
    * image.  Don't populate yet.  
    */
   ctx->Driver.TexImage2D(ctx, target, level, internalFormat,
                          width, height, border,
                          GL_RGBA, CHAN_TYPE, NULL,
                          &ctx->DefaultPacking, texObj, texImage);


   if (!do_copy_texsubimage(intel_context(ctx), target,
                            intel_texture_image(texImage),

Return to bug 275002

Lines 232-238 Link Here

(-)Mesa-7.4.3/src/mesa/drivers/dri/intel/intel_tex_copy.c (-9 / +9 lines)
232	if (border)	232	if (border)
233	goto fail;	233	goto fail;
234		234
235	srcx = x;	235	/* Setup or redefine the texture object, mipmap tree and texture
		236	* image. Don't populate yet.
		237	*/
		238	ctx->Driver.TexImage2D(ctx, target, level, internalFormat,
		239	width, height, border,
		240	GL_RGBA, CHAN_TYPE, NULL,
		241	&ctx->DefaultPacking, texObj, texImage);
		242
		243	srcx = x;
236	srcy = y;	244	srcy = y;
237	dstx = 0;	245	dstx = 0;
238	dsty = 0;	246	dsty = 0;
Lines 242-255 Link Here
242	&width, &height))	250	&width, &height))
243	return;	251	return;
244		252
245	/* Setup or redefine the texture object, mipmap tree and texture
246	* image. Don't populate yet.
247	*/
248	ctx->Driver.TexImage2D(ctx, target, level, internalFormat,
249	width, height, border,
250	GL_RGBA, CHAN_TYPE, NULL,
251	&ctx->DefaultPacking, texObj, texImage);
252
253		253
254	if (!do_copy_texsubimage(intel_context(ctx), target,	254	if (!do_copy_texsubimage(intel_context(ctx), target,
255	intel_texture_image(texImage),	255	intel_texture_image(texImage),