diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-02 23:17:14 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2013-07-09 14:08:53 -0700 |
| commit | ca437579b3974b91a5298707c459908a628c1098 (patch) | |
| tree | 294ac2ad5aa080554c23ebb79552e50b23fbcf31 /src/mesa/drivers/dri/i965/intel_tex_copy.c | |
| parent | 86f2711722dc10c25c2fabc09d8bd020a1ba6029 (diff) | |
| download | external_mesa3d-ca437579b3974b91a5298707c459908a628c1098.zip external_mesa3d-ca437579b3974b91a5298707c459908a628c1098.tar.gz external_mesa3d-ca437579b3974b91a5298707c459908a628c1098.tar.bz2 | |
i965: Pass brw_context to functions rather than intel_context.
This makes brw_context available in every function that used
intel_context. This makes it possible to start migrating fields from
intel_context to brw_context.
Surprisingly, this actually removes some code, as functions that use
OUT_BATCH don't need to declare "intel"; they just use "brw."
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Acked-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Paul Berry <stereotype441@gmail.com>
Acked-by: Anuj Phogat <anuj.phogat@gmail.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/intel_tex_copy.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_tex_copy.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_tex_copy.c b/src/mesa/drivers/dri/i965/intel_tex_copy.c index 72a4431..fece5a9 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_copy.c +++ b/src/mesa/drivers/dri/i965/intel_tex_copy.c @@ -46,7 +46,7 @@ static bool -intel_copy_texsubimage(struct intel_context *intel, +intel_copy_texsubimage(struct brw_context *brw, struct intel_texture_image *intelImage, GLint dstx, GLint dsty, GLint slice, struct intel_renderbuffer *irb, @@ -54,7 +54,7 @@ intel_copy_texsubimage(struct intel_context *intel, { const GLenum internalFormat = intelImage->base.Base.InternalFormat; - intel_prepare_render(intel); + intel_prepare_render(brw); /* glCopyTexSubImage() can be called on a multisampled renderbuffer (if * that renderbuffer is associated with the window system framebuffer), @@ -75,7 +75,7 @@ intel_copy_texsubimage(struct intel_context *intel, } /* blit from src buffer to texture */ - if (!intel_miptree_blit(intel, + if (!intel_miptree_blit(brw, irb->mt, irb->mt_level, irb->mt_layer, x, y, irb->Base.Base.Name == 0, intelImage->mt, intelImage->base.Base.Level, @@ -97,15 +97,16 @@ intelCopyTexSubImage(struct gl_context *ctx, GLuint dims, GLint x, GLint y, GLsizei width, GLsizei height) { + struct brw_context *brw = brw_context(ctx); struct intel_context *intel = intel_context(ctx); /* Try BLORP first. It can handle almost everything. */ - if (brw_blorp_copytexsubimage(intel, rb, texImage, slice, x, y, + if (brw_blorp_copytexsubimage(brw, rb, texImage, slice, x, y, xoffset, yoffset, width, height)) return; /* Next, try the BLT engine. */ - if (intel_copy_texsubimage(intel, + if (intel_copy_texsubimage(brw, intel_texture_image(texImage), xoffset, yoffset, slice, intel_renderbuffer(rb), x, y, width, height)) { |