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_validate.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_validate.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/intel_tex_validate.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c b/src/mesa/drivers/dri/i965/intel_tex_validate.c index e678d80..3665119 100644 --- a/src/mesa/drivers/dri/i965/intel_tex_validate.c +++ b/src/mesa/drivers/dri/i965/intel_tex_validate.c @@ -38,8 +38,9 @@ intel_update_max_level(struct intel_texture_object *intelObj, /* */ GLuint -intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit) +intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit) { + struct intel_context *intel = &brw->intel; struct gl_context *ctx = &intel->ctx; struct gl_texture_object *tObj = intel->ctx.Texture.Unit[unit]._Current; struct intel_texture_object *intelObj = intel_texture_object(tObj); @@ -95,7 +96,7 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit) _mesa_get_format_name(firstImage->base.Base.TexFormat), width, height, depth, tObj->BaseLevel, intelObj->_MaxLevel); - intelObj->mt = intel_miptree_create(intel, + intelObj->mt = intel_miptree_create(brw, intelObj->base.Target, firstImage->base.Base.TexFormat, tObj->BaseLevel, @@ -122,7 +123,7 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit) break; if (intelObj->mt != intelImage->mt) { - intel_miptree_copy_teximage(intel, intelImage, intelObj->mt, + intel_miptree_copy_teximage(brw, intelImage, intelObj->mt, false /* invalidate */); } |